From 2ef2967570ec8acd37a8497eb5ed8006ac8ca0c4 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Wed, 10 Jun 2015 16:07:53 -0700 Subject: [PATCH] Cleanup driver and graph db after stopping containers. Signed-off-by: David Calavera (cherry picked from commit 0964a664e85c88568863df30f43b0e3974093348) --- daemon/daemon.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index b5eae0d3e..4369a1793 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -979,16 +979,6 @@ func initNetworkController(config *Config) (libnetwork.NetworkController, error) } func (daemon *Daemon) Shutdown() error { - if daemon.containerGraph != nil { - if err := daemon.containerGraph.Close(); err != nil { - logrus.Errorf("Error during container graph.Close(): %v", err) - } - } - if daemon.driver != nil { - if err := daemon.driver.Cleanup(); err != nil { - logrus.Errorf("Error during graph storage driver.Cleanup(): %v", err) - } - } if daemon.containers != nil { group := sync.WaitGroup{} logrus.Debug("starting clean shutdown of all containers...") @@ -1017,6 +1007,18 @@ func (daemon *Daemon) Shutdown() error { } } + if daemon.containerGraph != nil { + if err := daemon.containerGraph.Close(); err != nil { + logrus.Errorf("Error during container graph.Close(): %v", err) + } + } + + if daemon.driver != nil { + if err := daemon.driver.Cleanup(); err != nil { + logrus.Errorf("Error during graph storage driver.Cleanup(): %v", err) + } + } + return nil }