From 70f0f7a20e9362c9a74752a497acd921cd591a42 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 1 Aug 2016 23:02:51 -0400 Subject: [PATCH] Fix issue reloading mount options on restart On daemon restart the local volume driver will read options that it persisted to disk, however it was reading an incorrect path, causing volume options to be silently ignored after a daemon restart. Signed-off-by: Brian Goff (cherry picked from commit c560dd968600ebc9c1ff78f256ee93a6ded9a728) Signed-off-by: Tibor Vass --- volume/local/local.go | 4 +++- volume/local/local_test.go | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/volume/local/local.go b/volume/local/local.go index caac4a411c..30aa9de4b7 100644 --- a/volume/local/local.go +++ b/volume/local/local.go @@ -88,7 +88,9 @@ func New(scope string, rootUID, rootGID int) (*Root, error) { path: r.DataPath(name), } r.volumes[name] = v - if b, err := ioutil.ReadFile(filepath.Join(name, "opts.json")); err == nil { + optsFilePath := filepath.Join(rootDirectory, name, "opts.json") + if b, err := ioutil.ReadFile(optsFilePath); err == nil { + v.opts = &optsConfig{} if err := json.Unmarshal(b, v.opts); err != nil { return nil, err } diff --git a/volume/local/local_test.go b/volume/local/local_test.go index fd8c4f8184..6b9ce55db9 100644 --- a/volume/local/local_test.go +++ b/volume/local/local_test.go @@ -3,6 +3,7 @@ package local import ( "io/ioutil" "os" + "reflect" "runtime" "strings" "testing" @@ -246,4 +247,18 @@ func TestCreateWithOpts(t *testing.T) { if !mounted { t.Fatal("expected mount to still be active") } + + r, err = New(rootDir, 0, 0) + if err != nil { + t.Fatal(err) + } + + v2, exists := r.volumes["test"] + if !exists { + t.Fatal("missing volume on restart") + } + + if !reflect.DeepEqual(v.opts, v2.opts) { + t.Fatal("missing volume options on restart") + } }