c24c37bd8a
When live-restoring a container the volume driver needs be notified that
there is an active mount for the volume.
Before this change the count is zero until the container stops and the
uint64 overflows pretty much making it so the volume can never be
removed until another daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 647c2a6cdd)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
67 lines
1.9 KiB
Go
67 lines
1.9 KiB
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/containerd/containerd/log"
|
|
mounttypes "github.com/docker/docker/api/types/mount"
|
|
"github.com/docker/docker/container"
|
|
volumesservice "github.com/docker/docker/volume/service"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
|
|
alive := container.IsRunning()
|
|
for _, config := range container.MountPoints {
|
|
if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
|
|
return err
|
|
}
|
|
if alive {
|
|
log.G(context.TODO()).WithFields(logrus.Fields{
|
|
"container": container.ID,
|
|
"volume": config.Volume.Name(),
|
|
}).Debug("Live-restoring volume for alive container")
|
|
if err := config.LiveRestore(context.TODO()); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (daemon *Daemon) removeMountPoints(container *container.Container, rm bool) error {
|
|
var rmErrors []string
|
|
ctx := context.TODO()
|
|
for _, m := range container.MountPoints {
|
|
if m.Type != mounttypes.TypeVolume || m.Volume == nil {
|
|
continue
|
|
}
|
|
daemon.volumes.Release(ctx, m.Volume.Name(), container.ID)
|
|
if !rm {
|
|
continue
|
|
}
|
|
|
|
// Do not remove named mountpoints
|
|
// these are mountpoints specified like `docker run -v <name>:/foo`
|
|
if m.Spec.Source != "" {
|
|
continue
|
|
}
|
|
|
|
err := daemon.volumes.Remove(ctx, m.Volume.Name())
|
|
// Ignore volume in use errors because having this
|
|
// volume being referenced by other container is
|
|
// not an error, but an implementation detail.
|
|
// This prevents docker from logging "ERROR: Volume in use"
|
|
// where there is another container using the volume.
|
|
if err != nil && !volumesservice.IsInUse(err) {
|
|
rmErrors = append(rmErrors, err.Error())
|
|
}
|
|
}
|
|
|
|
if len(rmErrors) > 0 {
|
|
return fmt.Errorf("Error removing volumes:\n%v", strings.Join(rmErrors, "\n"))
|
|
}
|
|
return nil
|
|
}
|