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

Merge pull request #13867 from calavera/fix_daemon_cleanup_order

Browse Source 
Cleanup driver and graph db after stopping containers.
This commit is contained in:
Arnaud Porterie
2015-06-10 17:05:41 -07:00
parent ad9080a87c 0964a664e8
commit 883d661b69
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
@@ -769,16 +769,6 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
}
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...")
@@ -807,6 +797,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
}