From c0f7819905050ebdb583afba5b6f760d3892adb8 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 12 Mar 2015 06:15:32 -0700 Subject: [PATCH] Make errors from graphdriver init friendlier In several cases graphdriver were just returning the low-level syscall error and that was making it all the way up to the daemon logs and in many cases was difficult to tell it was even coming from the graphdriver at all. Signed-off-by: Brian Goff --- daemon/daemon.go | 2 +- daemon/graphdriver/aufs/aufs.go | 2 +- daemon/graphdriver/overlay/overlay.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 7e38966cd3..7c26de50cc 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -876,7 +876,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) // Load storage driver driver, err := graphdriver.New(config.Root, config.GraphOptions) if err != nil { - return nil, err + return nil, fmt.Errorf("error intializing graphdriver: %v", err) } log.Debugf("Using graph driver %s", driver) diff --git a/daemon/graphdriver/aufs/aufs.go b/daemon/graphdriver/aufs/aufs.go index 22579b8b63..b16ad1a98f 100644 --- a/daemon/graphdriver/aufs/aufs.go +++ b/daemon/graphdriver/aufs/aufs.go @@ -378,7 +378,7 @@ func (a *Driver) mount(id, mountLabel string) error { } if err := a.aufsMount(layers, rw, target, mountLabel); err != nil { - return err + return fmt.Errorf("error creating aufs mount to %s: %v", target, err) } return nil } diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index 37162b5caf..afe12c5091 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -301,7 +301,7 @@ func (d *Driver) Get(id string, mountLabel string) (string, error) { opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir) if err := syscall.Mount("overlay", mergedDir, "overlay", 0, label.FormatMountLabel(opts, mountLabel)); err != nil { - return "", err + return "", fmt.Errorf("error creating overlay mount to %s: %v", mergedDir, err) } mount.path = mergedDir mount.mounted = true