From 7bce81e40dbc73b7e778d8676687efc3b04c6d39 Mon Sep 17 00:00:00 2001 From: xiadanni Date: Fri, 1 Feb 2019 01:45:57 +0800 Subject: [PATCH 091/111] overlay2: use global logger instance reason: This simplifies the code a lot. Cherry-pick from https://github.com/moby/moby/pull/37993/commits/a55d32546a8556f9e6cabbc99836b573b9944f0c Change-Id: I2c4998d677c8500701e077b2520b96fe49ea4364 Signed-off-by: Kir Kolyshkin Signed-off-by: xiadanni --- .../daemon/graphdriver/overlay2/check.go | 9 ++++----- .../daemon/graphdriver/overlay2/overlay.go | 20 +++++++++---------- .../daemon/graphdriver/overlay2/randomid.go | 3 +-- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/components/engine/daemon/graphdriver/overlay2/check.go b/components/engine/daemon/graphdriver/overlay2/check.go index d6ee42f47f..1703b7a00c 100644 --- a/components/engine/daemon/graphdriver/overlay2/check.go +++ b/components/engine/daemon/graphdriver/overlay2/check.go @@ -12,7 +12,6 @@ import ( "github.com/docker/docker/pkg/system" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) @@ -27,7 +26,7 @@ func doesSupportNativeDiff(d string) error { } defer func() { if err := os.RemoveAll(td); err != nil { - logrus.WithField("storage-driver", "overlay2").Warnf("Failed to remove check directory %v: %v", td, err) + logger.Warnf("Failed to remove check directory %v: %v", td, err) } }() @@ -62,7 +61,7 @@ func doesSupportNativeDiff(d string) error { } defer func() { if err := unix.Unmount(filepath.Join(td, "merged"), 0); err != nil { - logrus.WithField("storage-driver", "overlay2").Warnf("Failed to unmount check directory %v: %v", filepath.Join(td, "merged"), err) + logger.Warnf("Failed to unmount check directory %v: %v", filepath.Join(td, "merged"), err) } }() @@ -113,7 +112,7 @@ func supportsMultipleLowerDir(d string) error { } defer func() { if err := os.RemoveAll(td); err != nil { - logrus.WithField("storage-driver", "overlay2").Warnf("Failed to remove check directory %v: %v", td, err) + logger.Warnf("Failed to remove check directory %v: %v", td, err) } }() @@ -128,7 +127,7 @@ func supportsMultipleLowerDir(d string) error { return errors.Wrap(err, "failed to mount overlay") } if err := unix.Unmount(filepath.Join(td, "merged"), 0); err != nil { - logrus.WithField("storage-driver", "overlay2").Warnf("Failed to unmount check directory %v: %v", filepath.Join(td, "merged"), err) + logger.Warnf("Failed to unmount check directory %v: %v", filepath.Join(td, "merged"), err) } return nil } diff --git a/components/engine/daemon/graphdriver/overlay2/overlay.go b/components/engine/daemon/graphdriver/overlay2/overlay.go index d87f979673..71474f8f36 100644 --- a/components/engine/daemon/graphdriver/overlay2/overlay.go +++ b/components/engine/daemon/graphdriver/overlay2/overlay.go @@ -106,6 +106,7 @@ type Driver struct { } var ( + logger = logrus.WithField("storage-driver", "overlay2") backingFs = "" projectQuotaSupported = false @@ -157,8 +158,6 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap backingFs = fsName } - logger := logrus.WithField("storage-driver", "overlay2") - switch fsMagic { case graphdriver.FsMagicAufs, graphdriver.FsMagicEcryptfs, graphdriver.FsMagicNfsFs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs: logger.Errorf("'overlay2' is not supported over %s", backingFs) @@ -306,14 +305,14 @@ func supportsOverlay() error { return nil } } - logrus.WithField("storage-driver", "overlay2").Error("'overlay' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlay support loaded.") + logger.Error("'overlay' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlay support loaded.") return graphdriver.ErrNotSupported } func useNaiveDiff(home string) bool { useNaiveDiffLock.Do(func() { if err := doesSupportNativeDiff(home); err != nil { - logrus.WithField("storage-driver", "overlay2").Warnf("Not using native diff for overlay2, this may cause degraded performance for building images: %v", err) + logger.Warnf("Not using native diff for overlay2, this may cause degraded performance for building images: %v", err) useNaiveDiffOnly = true } }) @@ -629,11 +628,11 @@ func (d *Driver) Get(id, mountLabel string) (_ containerfs.ContainerFS, retErr e if retErr != nil { if c := d.ctr.Decrement(mergedDir); c <= 0 { if mntErr := unix.Unmount(mergedDir, 0); mntErr != nil { - logrus.WithField("storage-driver", "overlay2").Errorf("error unmounting %v: %v", mergedDir, mntErr) + logger.Errorf("error unmounting %v: %v", mergedDir, mntErr) } // Cleanup the created merged directory; see the comment in Put's rmdir if rmErr := unix.Rmdir(mergedDir); rmErr != nil && !os.IsNotExist(rmErr) { - logrus.WithField("storage-driver", "overlay2").Debugf("Failed to remove %s: %v: %v", id, rmErr, err) + logger.Debugf("Failed to remove %s: %v: %v", id, rmErr, err) } } } @@ -716,7 +715,6 @@ func (d *Driver) Put(id string) error { } mountpoint := path.Join(dir, "merged") - logger := logrus.WithField("storage-driver", "overlay2") if count := d.ctr.Decrement(mountpoint); count > 0 { return nil } @@ -802,7 +800,7 @@ func (d *Driver) ApplyDiff(id string, parent string, diff io.Reader) (size int64 applyDir := d.getDiffPath(id) - logrus.WithField("storage-driver", "overlay2").Debugf("Applying tar in %s", applyDir) + logger.Debugf("Applying tar in %s", applyDir) // Overlay doesn't need the parent id to apply the diff if err := untar(diff, applyDir, &archive.TarOptions{ UIDMaps: d.uidMaps, @@ -840,7 +838,7 @@ func (d *Driver) Diff(id, parent string) (io.ReadCloser, error) { } diffPath := d.getDiffPath(id) - logrus.WithField("storage-driver", "overlay2").Debugf("Tar with options on %s", diffPath) + logger.Debugf("Tar with options on %s", diffPath) return archive.TarWithOptions(diffPath, &archive.TarOptions{ Compression: archive.Uncompressed, UIDMaps: d.uidMaps, diff --git a/components/engine/daemon/graphdriver/overlay2/randomid.go b/components/engine/daemon/graphdriver/overlay2/randomid.go index 933d9fccb6..6ab50df8e6 100644 --- a/components/engine/daemon/graphdriver/overlay2/randomid.go +++ b/components/engine/daemon/graphdriver/overlay2/randomid.go @@ -12,7 +12,6 @@ import ( "syscall" "time" - "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) @@ -48,7 +47,7 @@ func generateID(l int) string { if retryOnError(err) && retries < maxretries { count += n retries++ - logrus.Errorf("error generating version 4 uuid, retrying: %v", err) + logger.Errorf("error generating version 4 uuid, retrying: %v", err) continue } -- 2.17.1