44152f6fb6
The daemon.lazyInitializeVolume() function only handles restoring Volumes if a Driver is specified. The Container's MountPoints field may also contain other kind of mounts (e.g., bind-mounts). Those were ignored, and don't return an error;1d9c8619cd/daemon/volumes.go (L243-L252C2)
However, the prepareMountPoints() assumed each MountPoint was a volume, and logged an informational message about the volume being restored;1d9c8619cd/daemon/mounts.go (L18-L25)
This would panic if the MountPoint was not a volume; github.com/docker/docker/daemon.(*Daemon).prepareMountPoints(0xc00054b7b8?, 0xc0007c2500) /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/mounts.go:24 +0x1c0 github.com/docker/docker/daemon.(*Daemon).restore.func5(0xc0007c2500, 0x0?) /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/daemon.go:552 +0x271 created by github.com/docker/docker/daemon.(*Daemon).restore /root/rpmbuild/BUILD/src/engine/.gopath/src/github.com/docker/docker/daemon/daemon.go:530 +0x8d8 panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x30 pc=0x564e9be4c7c0] This issue was introduced in647c2a6cdd
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commita490248f4d
) Signed-off-by: Cory Snider <csnider@mirantis.com>
70 lines
2 KiB
Go
70 lines
2 KiB
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
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 config.Volume == nil {
|
|
// FIXME(thaJeztah): should we check for config.Type here as well? (i.e., skip bind-mounts etc)
|
|
continue
|
|
}
|
|
if alive {
|
|
logrus.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
|
|
}
|