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

Merge pull request #47110 from corhere/backport-23.0/lock-container-when-deleting-root

Browse source 
[23.0 backport] Lock container when deleting its root directory
This commit is contained in:
Sebastiaan van Stijn 2024-01-19 12:11:16 +01:00 committed by GitHub
commit 190138d0ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/delete.go
View file

@ -138,7 +138,14 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, config ty
container.RWLayer = nil 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
// 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) err = errors.Wrapf(err, "unable to remove filesystem for %s", container.ID)
container.SetRemovalError(err) container.SetRemovalError(err)
return err return err