kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #34960 from sterchelen/34953-Prune-Volume-lack-event-entry

Browse source 
Fix #34953 how volumes are pruned from daemon
This commit is contained in:
Yong Tang 2017-10-12 09:24:26 -07:00 • committed by GitHub
commit 2a7388a6c4
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
daemon/delete.go
View file

@ -11,6 +11,7 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/layer" "github.com/docker/docker/layer"
"github.com/docker/docker/pkg/system" "github.com/docker/docker/pkg/system"
"github.com/docker/docker/volume"
volumestore "github.com/docker/docker/volume/store" volumestore "github.com/docker/docker/volume/store"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -148,10 +149,19 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, forceRemo
// If the volume is referenced by a container it is not removed // If the volume is referenced by a container it is not removed
// This is called directly from the Engine API // This is called directly from the Engine API
func (daemon *Daemon) VolumeRm(name string, force bool) error { func (daemon *Daemon) VolumeRm(name string, force bool) error {
err := daemon.volumeRm(name) v, err := daemon.volumes.Get(name)
if err != nil {
if force && volumestore.IsNotExist(err) {
return nil
}
return err
}
err = daemon.volumeRm(v)
if err != nil && volumestore.IsInUse(err) { if err != nil && volumestore.IsInUse(err) {
return stateConflictError{err} return stateConflictError{err}
} }
if err == nil || force { if err == nil || force {
daemon.volumes.Purge(name) daemon.volumes.Purge(name)
return nil return nil
@ -159,12 +169,7 @@ func (daemon *Daemon) VolumeRm(name string, force bool) error {
return err return err
} }
func (daemon *Daemon) volumeRm(name string) error { func (daemon *Daemon) volumeRm(v volume.Volume) error {
v, err := daemon.volumes.Get(name)
if err != nil {
return err
}
if err := daemon.volumes.Remove(v); err != nil { if err := daemon.volumes.Remove(v); err != nil {
return errors.Wrap(err, "unable to remove volume") return errors.Wrap(err, "unable to remove volume")
} }

2
daemon/prune.go
View file

@ -140,7 +140,7 @@ func (daemon *Daemon) VolumesPrune(ctx context.Context, pruneFilters filters.Arg
if err != nil { if err != nil {
logrus.Warnf("could not determine size of volume %s: %v", name, err) logrus.Warnf("could not determine size of volume %s: %v", name, err)
} }
err = daemon.volumes.Remove(v) err = daemon.volumeRm(v)
if err != nil { if err != nil {
logrus.Warnf("could not remove volume %s: %v", name, err) logrus.Warnf("could not remove volume %s: %v", name, err)
return nil return nil