74 lines
3.2 KiB
Diff
74 lines
3.2 KiB
Diff
From b2750c914429b4f981848d0c829ddfc0c8acc37e Mon Sep 17 00:00:00 2001
|
|
From: xiadanni <xiadanni@huawei.com>
|
|
Date: Fri, 1 Feb 2019 01:03:12 +0800
|
|
Subject: [PATCH 090/111] overlay2: Use index=off if possible
|
|
|
|
reason: Docker overlay driver can't work with index=on feature of
|
|
the Linux kernel "overlay" filesystem. In case the global
|
|
default is set to "yes", Docker will fail with EBUSY when
|
|
trying to mount.
|
|
|
|
Cherry-pick from https://github.com/moby/moby/pull/37993/commits/8422d85087bfa770b62ef4e1daaca95ee6783d86
|
|
|
|
Change-Id: Iad1addaca9983ba35c466951e04c7034b0a18fab
|
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
Signed-off-by: xiadanni <xiadanni@huawei.com>
|
|
---
|
|
.../daemon/graphdriver/overlay2/overlay.go | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/components/engine/daemon/graphdriver/overlay2/overlay.go b/components/engine/daemon/graphdriver/overlay2/overlay.go
|
|
index cf8993e9f3..d87f979673 100644
|
|
--- a/components/engine/daemon/graphdriver/overlay2/overlay.go
|
|
+++ b/components/engine/daemon/graphdriver/overlay2/overlay.go
|
|
@@ -111,6 +111,8 @@ var (
|
|
|
|
useNaiveDiffLock sync.Once
|
|
useNaiveDiffOnly bool
|
|
+
|
|
+ indexOff string
|
|
)
|
|
|
|
func init() {
|
|
@@ -228,7 +230,18 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap
|
|
return nil, fmt.Errorf("Storage Option overlay2.size only supported for backingFS XFS or ext4. Found %v", backingFs)
|
|
}
|
|
|
|
- logger.Debugf("backingFs=%s, projectQuotaSupported=%v", backingFs, projectQuotaSupported)
|
|
+ // figure out whether "index=off" option is recognized by the kernel
|
|
+ _, err = os.Stat("/sys/module/overlay/parameters/index")
|
|
+ switch {
|
|
+ case err == nil:
|
|
+ indexOff = "index=off,"
|
|
+ case os.IsNotExist(err):
|
|
+ // old kernel, no index -- do nothing
|
|
+ default:
|
|
+ logger.Warnf("Unable to detect whether overlay kernel module supports index parameter: %s", err)
|
|
+ }
|
|
+
|
|
+ logger.Debugf("backingFs=%s, projectQuotaSupported=%v, indexOff=%q", backingFs, projectQuotaSupported, indexOff)
|
|
|
|
return d, nil
|
|
}
|
|
@@ -632,7 +645,7 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e
|
|
for i, s := range splitLowers {
|
|
absLowers[i] = path.Join(d.home, s)
|
|
}
|
|
- opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", strings.Join(absLowers, ":"), path.Join(dir, "diff"), path.Join(dir, "work"))
|
|
+ opts := indexOff + "lowerdir=" + strings.Join(absLowers, ":") + ",upperdir=" + path.Join(dir, "diff") + ",workdir=" + path.Join(dir, "work")
|
|
mountData := label.FormatMountLabel(opts, mountLabel)
|
|
mount := unix.Mount
|
|
mountTarget := mergedDir
|
|
@@ -661,7 +674,7 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e
|
|
// fit within a page and relative links make the mount data much
|
|
// smaller at the expense of requiring a fork exec to chroot.
|
|
if len(mountData) > pageSize {
|
|
- opts = fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", string(lowers), path.Join(id, "diff"), path.Join(id, "work"))
|
|
+ opts = indexOff + "lowerdir=" + string(lowers) + ",upperdir=" + path.Join(id, "diff") + ",workdir=" + path.Join(id, "work")
|
|
mountData = label.FormatMountLabel(opts, mountLabel)
|
|
if len(mountData) > pageSize {
|
|
return nil, fmt.Errorf("cannot mount layer, mount label too large %d", len(mountData))
|
|
--
|
|
2.17.1
|
|
|