Fix daemon not cleaned up w/ live restore enabled #24435
Conversation
This patch makes sure daemon resources are cleaned up on shutdown if there are no running containers. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
cpuguy83
force-pushed
the
24350_cleanup_on_no_running_containers
branch
from
fae7699
to
2d5dc94
Compare
|
Experimental hitting a flaky test; #24203 |
|
LGTM |
| @@ -652,8 +652,12 @@ func (daemon *Daemon) Shutdown() error { | |||
| // Keep mounts and networking running on daemon shutdown if | |||
| // we are to keep containers running and restore them. | |||
| if daemon.configStore.LiveRestore { | |||
| return 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 { | |||
There was a problem hiding this comment.
isn't less expensive and probably cleaner to call daemon.containers.List() (or daemon.List()) then daemon.Containers(...)? I can see much stuff going on with daemon.Containers(...) - like filters even if you're providing an empty list option
There was a problem hiding this comment.
daemon.containers.List will have to be manually filtered anyway.
|
just a question, LGTM otherwise |
|
If there is a mix of running and stopped containers during daemon shutdown, dont we still want the stopped container mounts to be unmounted and other cleanup performed? |
|
@anusha-ragunathan The stopped containers will already be unmounted. |
|
Yes, the graph driver mount is what I'm referring to. daemon.layerStore.Cleanup and daemon.cleanupMounts to be specific. |
|
@anusha-ragunathan If there are running containers, we can't unmount the root graph mount. |
|
layerStore.Cleanup calls the graphdriver's Cleanup method, which is:
LGTM. |
|
LGTM |
This patch makes sure daemon resources are cleaned up on shutdown if
there are no running containers.
Fixes #24350