From 27fffbebb61ca72a8165a0580d78e941bce381b1 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 19 May 2014 21:22:33 +0000 Subject: [PATCH] starts by removing the name from the graph db Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: c12dd770908acc06ab402840ad7736e0c056b567 Component: engine --- components/engine/daemon/daemon.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/engine/daemon/daemon.go b/components/engine/daemon/daemon.go index fc9f07052e..5df5d434fb 100644 --- a/components/engine/daemon/daemon.go +++ b/components/engine/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) }