Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor libcontainerd to minimize containerd RPCs #43564

Merged
merged 7 commits into from Aug 25, 2022
Merged

Refactor libcontainerd to minimize containerd RPCs #43564

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b752462
Stop locking container exec store while starting
corhere Apr 21, 2022
57d2d6e
Update container OOMKilled flag immediately
corhere Apr 26, 2022
4bafaa0
Refactor libcontainerd to minimize c8d RPCs
corhere May 10, 2022
6a2f385
Share logic to create-or-replace a container
corhere May 5, 2022
18e322b
Lock container when deleting its root directory
corhere May 9, 2022
15b8e4a
integration: synchronize TestWaitConditions
corhere Jul 25, 2022
a09f8db
daemon: Maintain container exec-inspect invariant
corhere Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion daemon/delete.go
View file
Open in desktop
Expand Up @@ -138,7 +138,14 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, config ty
container.RWLayer = nil
}

if err := containerfs.EnsureRemoveAll(container.Root); err != nil {
// Hold the container lock while deleting the container root directory
// so that other goroutines don't attempt to concurrently open files
Comment on lines +141 to +142
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find 👍

// within it. Having any file open on Windows (without the
// FILE_SHARE_DELETE flag) will block it from being deleted.
container.Lock()
err := containerfs.EnsureRemoveAll(container.Root)
container.Unlock()
if err != nil {
err = errors.Wrapf(err, "unable to remove filesystem for %s", container.ID)
container.SetRemovalError(err)
return err
Expand Down