clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 12:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup driver and graph db after stopping containers.

Browse Source 
Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 0964a664e8)
This commit is contained in:
David Calavera
2015-06-11 12:49:52 -07:00
committed by Jessica Frazelle
parent ceda1e75a4
commit 2ef2967570
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon.go
+12 -10
View File
@@ -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
}