diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-02-15 09:34:37 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-02-21 10:51:42 -0500 |
| commit | ca8ae877c12cbfa368d572ef6700d9e4a23d5b11 (patch) | |
| tree | ff88667c11ccf69576a85fbccffab68fbc95b326 /libpod/runtime_ctr.go | |
| parent | 9353a3e8ec3855f29c552dd1e0134dbaa3031efa (diff) | |
| download | podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.tar.gz podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.tar.bz2 podman-ca8ae877c12cbfa368d572ef6700d9e4a23d5b11.zip | |
Remove locks from volumes
I was looking into why we have locks in volumes, and I'm fairly
convinced they're unnecessary.
We don't have a state whose accesses we need to guard with locks
and syncs. The only real purpose for the lock was to prevent
concurrent removal of the same volume.
Looking at the code, concurrent removal ought to be fine with a
bit of reordering - one or the other might fail, but we will
successfully evict the volume from the state.
Also, remove the 'prune' bool from RemoveVolume. None of our
other API functions accept it, and it only served to toggle off
more verbose error messages.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 1055da75b..2ec8d0795 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -421,7 +421,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, for _, v := range volumes { if volume, err := runtime.state.Volume(v); err == nil { - if err := runtime.removeVolume(ctx, volume, false, true); err != nil && err != ErrNoSuchVolume && err != ErrVolumeBeingUsed { + if err := runtime.removeVolume(ctx, volume, false); err != nil && err != ErrNoSuchVolume && err != ErrVolumeBeingUsed { logrus.Errorf("cleanup volume (%s): %v", v, err) } } |