소스 검색

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 <cpuguy83@gmail.com>
Brian Goff 9 년 전
부모
커밋
c560dd9686
2개의 변경된 파일18개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      volume/local/local.go
  2. 15 0
      volume/local/local_test.go

+ 3 - 1
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
 			}

+ 15 - 0
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")
+	}
 }