Skip to content

Commit 91cffdb

Browse files
vdemeestervdemeester
authored
Merge pull request moby#31159 from tonistiigi/fix-size-lock
Don’t hold container lock for size calculation
2 parents 475a8be + bd33a99 commit 91cffdb

File tree

6 files changed

+39
-33
lines changed

6 files changed

+39
-33
lines changed

‎daemon/container_operations_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]s
1212
}
1313

1414
// getSize returns real size & virtual size
15-
func (daemon *Daemon) getSize(container *container.Container) (int64, int64) {
15+
func (daemon *Daemon) getSize(containerID string) (int64, int64) {
1616
// TODO Windows
1717
return 0, 0
1818
}

‎daemon/getsize_unix.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@ package daemon
44

55
import (
66
"github.com/Sirupsen/logrus"
7-
"github.com/docker/docker/container"
87
)
98

109
// getSize returns the real size & virtual size of the container.
11-
func (daemon *Daemon) getSize(container *container.Container) (int64, int64) {
10+
func (daemon *Daemon) getSize(containerID string) (int64, int64) {
1211
var (
1312
sizeRw, sizeRootfs int64
1413
err error
1514
)
1615

17-
if err := daemon.Mount(container); err != nil {
18-
logrus.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)
16+
rwlayer, err := daemon.layerStore.GetRWLayer(containerID)
17+
if err != nil {
18+
logrus.Errorf("Failed to compute size of container rootfs %v: %v", containerID, err)
1919
return sizeRw, sizeRootfs
2020
}
21-
defer daemon.Unmount(container)
21+
defer daemon.layerStore.ReleaseRWLayer(rwlayer)
2222

23-
sizeRw, err = container.RWLayer.Size()
23+
sizeRw, err = rwlayer.Size()
2424
if err != nil {
2525
logrus.Errorf("Driver %s couldn't return diff size of container %s: %s",
26-
daemon.GraphDriverName(), container.ID, err)
26+
daemon.GraphDriverName(), containerID, err)
2727
// FIXME: GetSize should return an error. Not changing it now in case
2828
// there is a side-effect.
2929
sizeRw = -1
3030
}
3131

32-
if parent := container.RWLayer.Parent(); parent != nil {
32+
if parent := rwlayer.Parent(); parent != nil {
3333
sizeRootfs, err = parent.Size()
3434
if err != nil {
3535
sizeRootfs = -1

‎daemon/inspect.go‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func (daemon *Daemon) ContainerInspectCurrent(name string, size bool) (*types.Co
3636
}
3737

3838
container.Lock()
39-
defer container.Unlock()
4039

41-
base, err := daemon.getInspectData(container, size)
40+
base, err := daemon.getInspectData(container)
4241
if err != nil {
42+
container.Unlock()
4343
return nil, err
4444
}
4545

@@ -73,6 +73,14 @@ func (daemon *Daemon) ContainerInspectCurrent(name string, size bool) (*types.Co
7373
}
7474
networkSettings.NetworkSettingsBase.Ports = ports
7575

76+
container.Unlock()
77+
78+
if size {
79+
sizeRw, sizeRootFs := daemon.getSize(base.ID)
80+
base.SizeRw = &sizeRw
81+
base.SizeRootFs = &sizeRootFs
82+
}
83+
7684
return &types.ContainerJSON{
7785
ContainerJSONBase: base,
7886
Mounts: mountPoints,
@@ -91,7 +99,7 @@ func (daemon *Daemon) containerInspect120(name string) (*v1p20.ContainerJSON, er
9199
container.Lock()
92100
defer container.Unlock()
93101

94-
base, err := daemon.getInspectData(container, false)
102+
base, err := daemon.getInspectData(container)
95103
if err != nil {
96104
return nil, err
97105
}
@@ -114,7 +122,7 @@ func (daemon *Daemon) containerInspect120(name string) (*v1p20.ContainerJSON, er
114122
}, nil
115123
}
116124

117-
func (daemon *Daemon) getInspectData(container *container.Container, size bool) (*types.ContainerJSONBase, error) {
125+
func (daemon *Daemon) getInspectData(container *container.Container) (*types.ContainerJSONBase, error) {
118126
// make a copy to play with
119127
hostConfig := *container.HostConfig
120128

@@ -168,16 +176,6 @@ func (daemon *Daemon) getInspectData(container *container.Container, size bool)
168176
HostConfig: &hostConfig,
169177
}
170178

171-
var (
172-
sizeRw int64
173-
sizeRootFs int64
174-
)
175-
if size {
176-
sizeRw, sizeRootFs = daemon.getSize(container)
177-
contJSONBase.SizeRw = &sizeRw
178-
contJSONBase.SizeRootFs = &sizeRootFs
179-
}
180-
181179
// Now set any platform-specific fields
182180
contJSONBase = setPlatformSpecificContainerFields(container, contJSONBase)
183181

‎daemon/inspect_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON,
3030
container.Lock()
3131
defer container.Unlock()
3232

33-
base, err := daemon.getInspectData(container, false)
33+
base, err := daemon.getInspectData(container)
3434
if err != nil {
3535
return nil, err
3636
}

‎daemon/list.go‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,32 @@ func (daemon *Daemon) reduceContainers(config *types.ContainerListOptions, reduc
208208
// reducePsContainer is the basic representation for a container as expected by the ps command.
209209
func (daemon *Daemon) reducePsContainer(container *container.Container, ctx *listContext, reducer containerReducer) (*types.Container, error) {
210210
container.Lock()
211-
defer container.Unlock()
212211

213212
// filter containers to return
214213
action := includeContainerInList(container, ctx)
215214
switch action {
216215
case excludeContainer:
216+
container.Unlock()
217217
return nil, nil
218218
case stopIteration:
219+
container.Unlock()
219220
return nil, errStopIteration
220221
}
221222

222223
// transform internal container struct into api structs
223-
return reducer(container, ctx)
224+
newC, err := reducer(container, ctx)
225+
container.Unlock()
226+
if err != nil {
227+
return nil, err
228+
}
229+
230+
// release lock because size calculation is slow
231+
if ctx.Size {
232+
sizeRw, sizeRootFs := daemon.getSize(newC.ID)
233+
newC.SizeRw = sizeRw
234+
newC.SizeRootFs = sizeRootFs
235+
}
236+
return newC, nil
224237
}
225238

226239
// foldFilter generates the container filter based on the user's filtering options.
@@ -642,11 +655,6 @@ func (daemon *Daemon) transformContainer(container *container.Container, ctx *li
642655
}
643656
}
644657

645-
if ctx.Size {
646-
sizeRw, sizeRootFs := daemon.getSize(container)
647-
newC.SizeRw = sizeRw
648-
newC.SizeRootFs = sizeRootFs
649-
}
650658
newC.Labels = container.Config.Labels
651659
newC.Mounts = addMountPoints(container)
652660

‎daemon/prune.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/docker/docker/runconfig"
1717
"github.com/docker/docker/volume"
1818
"github.com/docker/libnetwork"
19-
"github.com/opencontainers/go-digest"
19+
digest "github.com/opencontainers/go-digest"
2020
)
2121

2222
// ContainersPrune removes unused containers
@@ -34,7 +34,7 @@ func (daemon *Daemon) ContainersPrune(pruneFilters filters.Args) (*types.Contain
3434
if !until.IsZero() && c.Created.After(until) {
3535
continue
3636
}
37-
cSize, _ := daemon.getSize(c)
37+
cSize, _ := daemon.getSize(c.ID)
3838
// TODO: sets RmLink to true?
3939
err := daemon.ContainerRm(c.ID, &types.ContainerRmConfig{})
4040
if err != nil {

0 commit comments

Comments
 (0)