From aeae50e71e8b643d4413124dc15d191f817ef236 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Tue, 11 Apr 2017 09:56:36 -0400 Subject: [PATCH] Make sure plugin rootfs is unmounted on upgraded In some cases, if a user specifies `-f` when disabling a plugin mounts can still exist on the plugin rootfs. This can cause problems during upgrade where the rootfs is removed and may cause data loss. To resolve this, ensure the rootfs is unmounted before performing an upgrade. Signed-off-by: Brian Goff Upstream-commit: 83f44d232d2c5d7ce7c5e10d2cd0f912d32c2ea5 Component: engine --- components/engine/plugin/backend_linux.go | 2 +- components/engine/plugin/manager_linux.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/engine/plugin/backend_linux.go b/components/engine/plugin/backend_linux.go index 8153727860..1f01dab6a7 100644 --- a/components/engine/plugin/backend_linux.go +++ b/components/engine/plugin/backend_linux.go @@ -648,7 +648,7 @@ func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error { func getMounts(root string) ([]string, error) { infos, err := mount.GetMounts() if err != nil { - return nil, errors.Wrap(err, "failed to read mount table while performing recursive unmount") + return nil, errors.Wrap(err, "failed to read mount table") } var mounts []string diff --git a/components/engine/plugin/manager_linux.go b/components/engine/plugin/manager_linux.go index b8638dfe7d..80fc041623 100644 --- a/components/engine/plugin/manager_linux.go +++ b/components/engine/plugin/manager_linux.go @@ -199,9 +199,17 @@ func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest digest.Digest, blobs pdir := filepath.Join(pm.config.Root, p.PluginObj.ID) orig := filepath.Join(pdir, "rootfs") + + // Make sure nothing is mounted + // This could happen if the plugin was disabled with `-f` with active mounts. + // If there is anything in `orig` is still mounted, this should error out. + if err := recursiveUnmount(orig); err != nil { + return err + } + backup := orig + "-old" if err := os.Rename(orig, backup); err != nil { - return err + return errors.Wrap(err, "error backing up plugin data before upgrade") } defer func() {