Merge pull request moby#5915 from vieux/start_remove_link

starts by removing the name from the graph db
imdaisyadams · May 19, 2014 · b5d0bdc · b5d0bdc
2 parents 2d1c245 + c12dd77
commit b5d0bdc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -291,6 +291,10 @@ func (daemon *Daemon) Destroy(container *Container) error {
 	daemon.idIndex.Delete(container.ID)
 	daemon.containers.Remove(element)
 
+	if _, err := daemon.containerGraph.Purge(container.ID); err != nil {
+		utils.Debugf("Unable to remove container from link graph: %s", err)
+	}
+
 	if err := daemon.driver.Remove(container.ID); err != nil {
 		return fmt.Errorf("Driver %s failed to remove root filesystem %s: %s", daemon.driver, container.ID, err)
 	}
@@ -300,10 +304,6 @@ func (daemon *Daemon) Destroy(container *Container) error {
 		return fmt.Errorf("Driver %s failed to remove init filesystem %s: %s", daemon.driver, initID, err)
 	}
 
-	if _, err := daemon.containerGraph.Purge(container.ID); err != nil {
-		utils.Debugf("Unable to remove container from link graph: %s", err)
-	}
-
 	if err := os.RemoveAll(container.root); err != nil {
 		return fmt.Errorf("Unable to remove filesystem for %v: %v", container.ID, err)
 	}