mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
cb7b329911
While working on deprecation of the `aufs` and `overlay` storage-drivers, the `TestCleanupMounts` had to be updated, as it was currently using `aufs` for testing. When rewriting the test to use `overlay2` instead (using an updated `mountsFixture`), I found out that the test was failing, and it appears that only `overlay`, but not `overlay2` was taken into account. These cleanup functions were added in05cc737f54
, but at the time the `overlay2` storage driver was not yet implemented;05cc737f54/daemon/graphdriver
This omission was likely missed in23e5c94cfb
, because the original implementation re-used the `overlay` storage driver, but later on it was decided to make `overlay2` a separate storage driver. As a result of the above, `daemon.cleanupMountsByID()` would ignore any `overlay2` mounts during `daemon.Shutdown()` and `daemon.Cleanup()`. This patch: - Adds a new `mountsFixtureOverlay2` with example mounts for `overlay2` - Rewrites the tests to use `gotest.tools` for more informative output on failures. - Adds the missing regex patterns to `daemon/getCleanPatterns()`. The patterns are added at the start of the list to allow for the fasted match (`overlay2` is the default for most setups, and the code is iterating over possible options). As a follow-up, we could consider adding additional fixtures for different storage drivers. Before the fix is applied: go test -v -run TestCleanupMounts ./daemon/ === RUN TestCleanupMounts === RUN TestCleanupMounts/aufs === RUN TestCleanupMounts/overlay2 daemon_linux_test.go:135: assertion failed: 0 (unmounted int) != 1 (int): Expected to unmount the shm (and the shm only) --- FAIL: TestCleanupMounts (0.01s) --- PASS: TestCleanupMounts/aufs (0.00s) --- FAIL: TestCleanupMounts/overlay2 (0.01s) === RUN TestCleanupMountsByID === RUN TestCleanupMountsByID/aufs === RUN TestCleanupMountsByID/overlay2 daemon_linux_test.go:171: assertion failed: 0 (unmounted int) != 1 (int): Expected to unmount the root (and that only) --- FAIL: TestCleanupMountsByID (0.00s) --- PASS: TestCleanupMountsByID/aufs (0.00s) --- FAIL: TestCleanupMountsByID/overlay2 (0.00s) FAIL FAIL github.com/docker/docker/daemon 0.054s FAIL With the fix applied: go test -v -run TestCleanupMounts ./daemon/ === RUN TestCleanupMounts === RUN TestCleanupMounts/aufs === RUN TestCleanupMounts/overlay2 --- PASS: TestCleanupMounts (0.00s) --- PASS: TestCleanupMounts/aufs (0.00s) --- PASS: TestCleanupMounts/overlay2 (0.00s) === RUN TestCleanupMountsByID === RUN TestCleanupMountsByID/aufs === RUN TestCleanupMountsByID/overlay2 --- PASS: TestCleanupMountsByID (0.00s) --- PASS: TestCleanupMountsByID/aufs (0.00s) --- PASS: TestCleanupMountsByID/overlay2 (0.00s) PASS ok github.com/docker/docker/daemon 0.042s Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
143 lines
3.9 KiB
Go
143 lines
3.9 KiB
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/daemon/config"
|
|
"github.com/docker/docker/libnetwork/resolvconf"
|
|
"github.com/moby/sys/mount"
|
|
"github.com/moby/sys/mountinfo"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// On Linux, plugins use a static path for storing execution state,
|
|
// instead of deriving path from daemon's exec-root. This is because
|
|
// plugin socket files are created here and they cannot exceed max
|
|
// path length of 108 bytes.
|
|
func getPluginExecRoot(root string) string {
|
|
return "/run/docker/plugins"
|
|
}
|
|
|
|
func (daemon *Daemon) cleanupMountsByID(id string) error {
|
|
logrus.Debugf("Cleaning up old mountid %s: start.", id)
|
|
f, err := os.Open("/proc/self/mountinfo")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer f.Close()
|
|
|
|
return daemon.cleanupMountsFromReaderByID(f, id, mount.Unmount)
|
|
}
|
|
|
|
func (daemon *Daemon) cleanupMountsFromReaderByID(reader io.Reader, id string, unmount func(target string) error) error {
|
|
if daemon.root == "" {
|
|
return nil
|
|
}
|
|
var errs []string
|
|
|
|
regexps := getCleanPatterns(id)
|
|
sc := bufio.NewScanner(reader)
|
|
for sc.Scan() {
|
|
if fields := strings.Fields(sc.Text()); len(fields) > 4 {
|
|
if mnt := fields[4]; strings.HasPrefix(mnt, daemon.root) {
|
|
for _, p := range regexps {
|
|
if p.MatchString(mnt) {
|
|
if err := unmount(mnt); err != nil {
|
|
logrus.Error(err)
|
|
errs = append(errs, err.Error())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := sc.Err(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(errs) > 0 {
|
|
return fmt.Errorf("Error cleaning up mounts:\n%v", strings.Join(errs, "\n"))
|
|
}
|
|
|
|
logrus.Debugf("Cleaning up old mountid %v: done.", id)
|
|
return nil
|
|
}
|
|
|
|
// cleanupMounts umounts used by container resources and the daemon root mount
|
|
func (daemon *Daemon) cleanupMounts() error {
|
|
if err := daemon.cleanupMountsByID(""); err != nil {
|
|
return err
|
|
}
|
|
|
|
info, err := mountinfo.GetMounts(mountinfo.SingleEntryFilter(daemon.root))
|
|
if err != nil {
|
|
return errors.Wrap(err, "error reading mount table for cleanup")
|
|
}
|
|
|
|
if len(info) < 1 {
|
|
// no mount found, we're done here
|
|
return nil
|
|
}
|
|
|
|
// `info.Root` here is the root mountpoint of the passed in path (`daemon.root`).
|
|
// The ony cases that need to be cleaned up is when the daemon has performed a
|
|
// `mount --bind /daemon/root /daemon/root && mount --make-shared /daemon/root`
|
|
// This is only done when the daemon is started up and `/daemon/root` is not
|
|
// already on a shared mountpoint.
|
|
if !shouldUnmountRoot(daemon.root, info[0]) {
|
|
return nil
|
|
}
|
|
|
|
unmountFile := getUnmountOnShutdownPath(daemon.configStore)
|
|
if _, err := os.Stat(unmountFile); err != nil {
|
|
return nil
|
|
}
|
|
|
|
logrus.WithField("mountpoint", daemon.root).Debug("unmounting daemon root")
|
|
if err := mount.Unmount(daemon.root); err != nil {
|
|
return err
|
|
}
|
|
return os.Remove(unmountFile)
|
|
}
|
|
|
|
func getCleanPatterns(id string) (regexps []*regexp.Regexp) {
|
|
var patterns []string
|
|
if id == "" {
|
|
id = "[0-9a-f]{64}"
|
|
patterns = append(patterns, "containers/"+id+"/mounts/shm", "containers/"+id+"/shm")
|
|
}
|
|
patterns = append(patterns, "overlay2/"+id+"/merged$", "aufs/mnt/"+id+"$", "overlay/"+id+"/merged$", "zfs/graph/"+id+"$")
|
|
for _, p := range patterns {
|
|
r, err := regexp.Compile(p)
|
|
if err == nil {
|
|
regexps = append(regexps, r)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func shouldUnmountRoot(root string, info *mountinfo.Info) bool {
|
|
if !strings.HasSuffix(root, info.Root) {
|
|
return false
|
|
}
|
|
return hasMountInfoOption(info.Optional, sharedPropagationOption)
|
|
}
|
|
|
|
// setupResolvConf sets the appropriate resolv.conf file if not specified
|
|
// When systemd-resolved is running the default /etc/resolv.conf points to
|
|
// localhost. In this case fetch the alternative config file that is in a
|
|
// different path so that containers can use it
|
|
// In all the other cases fallback to the default one
|
|
func setupResolvConf(config *config.Config) {
|
|
if config.ResolvConf != "" {
|
|
return
|
|
}
|
|
config.ResolvConf = resolvconf.Path()
|
|
}
|