0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27128 from anusha-ragunathan/plugin-shutdown

Browse source 
Shutdown plugins after containers.
This commit is contained in:
Anusha Ragunathan 2016-10-03 17:08:22 -07:00 • committed by GitHub
commit 671d01aabf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/daemon.go
View file

@ -726,8 +726,6 @@ func (daemon *Daemon) Shutdown() error {
// Keep mounts and networking running on daemon shutdown if
// we are to keep containers running and restore them.
pluginShutdown()
if daemon.configStore.LiveRestoreEnabled && daemon.containers != nil {
// check if there are any running containers, if none we should do some cleanup
if ls, err := daemon.Containers(&types.ContainerListOptions{}); len(ls) != 0 || err != nil {
@ -753,6 +751,9 @@ func (daemon *Daemon) Shutdown() error {
})
}
// Shutdown plugins after containers. Dont change the order.
pluginShutdown()
// trigger libnetwork Stop only if it's initialized
if daemon.netController != nil {
daemon.netController.Stop()