kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Move plugin shutdown after layerstore shtudown

Browse source 
This ensures that graphdriver plugins can properly cleanup on daemon
exit.
Also prevents errors during shutdown when it tries to send the plugin a
`Cleanup()` request but ultimately times out since it's already been
shutdown.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 4b400ecc4d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
This commit is contained in:
Brian Goff 2016-11-29 20:00:02 -05:00 • committed by Victor Vieux
parent 6c466eadb7
commit bb55c05ec1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
daemon/daemon.go
View file

@ -796,7 +796,13 @@ func (daemon *Daemon) Shutdown() error {
}) })
} }
// Shutdown plugins after containers. Don't change the order. if daemon.layerStore != nil {
if err := daemon.layerStore.Cleanup(); err != nil {
logrus.Errorf("Error during layer Store.Cleanup(): %v", err)
}
}
// Shutdown plugins after containers and layerstore. Don't change the order.
daemon.pluginShutdown() daemon.pluginShutdown()
// trigger libnetwork Stop only if it's initialized // trigger libnetwork Stop only if it's initialized
@ -804,12 +810,6 @@ func (daemon *Daemon) Shutdown() error {
daemon.netController.Stop() daemon.netController.Stop()
} }
if daemon.layerStore != nil {
if err := daemon.layerStore.Cleanup(); err != nil {
logrus.Errorf("Error during layer Store.Cleanup(): %v", err)
}
}
if err := daemon.cleanupMounts(); err != nil { if err := daemon.cleanupMounts(); err != nil {
return err return err
} }