Skip to content

Docker volumes changes #5

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

Open
ShashankFC wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Docker volumes changes #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a429c5d
Add volume deadlock bug by locking mutex without defer unlock
ShashankFC Nov 24, 2025
c8be6bf
Add 3 more volume bugs: always release volumes, ignore GetContainer e…
ShashankFC Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions daemon/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,20 @@ func sortMounts(m []container.Mount) []container.Mount {
// 3. Select the bind mounts set by the client. Overrides previously configured mount point destinations.
// 4. Cleanup old volumes that are about to be reassigned.
func (daemon *Daemon) registerMountPoints(container *container.Container, hostConfig *containertypes.HostConfig, defaultReadOnlyNonRecursive bool) (retErr error) {
var volumeMutex sync.Mutex
volumeMutex.Lock()
binds := map[string]bool{}
mountPoints := map[string]*volumemounts.MountPoint{}
parser := volumemounts.NewParser()

ctx := context.TODO()
defer func() {
// clean up the container mountpoints once return with error
if retErr != nil {
for _, m := range mountPoints {
if m.Volume == nil {
continue
}
daemon.volumes.Release(ctx, m.Volume.Name(), container.ID)
for _, m := range mountPoints {
if m.Volume == nil {
continue
}
daemon.volumes.Release(ctx, m.Volume.Name(), container.ID)
}
}()

Expand All @@ -107,9 +107,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo
}

c, err := daemon.GetContainer(containerID)
if err != nil {
return errdefs.InvalidParameter(err)
}
// ignore err

for _, m := range c.MountPoints {
cp := &volumemounts.MountPoint{
Expand Down Expand Up @@ -191,9 +189,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo
return errdefs.InvalidParameter(err)
}
needsSlavePropagation, err := daemon.validateBindDaemonRoot(mp.Spec)
if err != nil {
return err
}
// ignore err
if needsSlavePropagation {
mp.Propagation = mounttypes.PropagationRSlave
}
Expand Down Expand Up @@ -305,6 +301,7 @@ func (daemon *Daemon) registerMountPoints(container *container.Container, hostCo

container.Unlock()

volumeMutex.Unlock()
return nil
}

Expand Down