Merge pull request #2397 from mheon/volume_path_fixes

Volume path fixes

6 files changed, 52 insertions, 4 deletions

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 25ef5cd0e..c226a0617 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -261,12 +261,14 @@ func (s *BoltState) GetDBConfig() (*DBConfig, error) {
 		storageRoot := configBucket.Get(graphRootKey)
 		storageTmp := configBucket.Get(runRootKey)
 		graphDriver := configBucket.Get(graphDriverKey)
+		volumePath := configBucket.Get(volPathKey)
 
 		cfg.LibpodRoot = string(libpodRoot)
 		cfg.LibpodTmp = string(libpodTmp)
 		cfg.StorageRoot = string(storageRoot)
 		cfg.StorageTmp = string(storageTmp)
 		cfg.GraphDriver = string(graphDriver)
+		cfg.VolumePath = string(volumePath)
 
 		return nil
 	})
diff --git a/libpod/boltdb_state_internal.go b/libpod/boltdb_state_internal.go
index 3d749849d..936ccbf4c 100644
--- a/libpod/boltdb_state_internal.go
+++ b/libpod/boltdb_state_internal.go
@@ -38,6 +38,7 @@ const (
 	graphRootName   = "graph-root"
 	graphDriverName = "graph-driver-name"
 	osName          = "os"
+	volPathName     = "volume-path"
 )
 
 var (
@@ -67,6 +68,7 @@ var (
 	graphRootKey   = []byte(graphRootName)
 	graphDriverKey = []byte(graphDriverName)
 	osKey          = []byte(osName)
+	volPathKey     = []byte(volPathName)
 )
 
 // Check if the configuration of the database is compatible with the
@@ -105,10 +107,15 @@ func checkRuntimeConfig(db *bolt.DB, rt *Runtime) error {
 			return err
 		}
 
-		return validateDBAgainstConfig(configBkt, "storage graph driver",
+		if err := validateDBAgainstConfig(configBkt, "storage graph driver",
 			rt.config.StorageConfig.GraphDriverName,
 			graphDriverKey,
-			storage.DefaultStoreOptions.GraphDriverName)
+			storage.DefaultStoreOptions.GraphDriverName); err != nil {
+			return err
+		}
+
+		return validateDBAgainstConfig(configBkt, "volume path",
+			rt.config.VolumePath, volPathKey, "")
 	})
 
 	return err
diff --git a/libpod/info.go b/libpod/info.go
index 191ce6810..62088b730 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -121,6 +121,7 @@ func (r *Runtime) storeInfo() (map[string]interface{}, error) {
 	info["RunRoot"] = r.store.RunRoot()
 	info["GraphDriverName"] = r.store.GraphDriverName()
 	info["GraphOptions"] = r.store.GraphOptions()
+	info["VolumePath"] = r.config.VolumePath
 	statusPairs, err := r.store.Status()
 	if err != nil {
 		return nil, err
diff --git a/libpod/options.go b/libpod/options.go
index e22c81f91..184d5d59f 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -47,6 +47,11 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
 			rt.config.StaticDir = filepath.Join(config.GraphRoot, "libpod")
 			rt.configuredFrom.libpodStaticDirSet = true
 
+			// Also set libpod volume path, so we are a subdirectory
+			// of the c/storage store by default
+			rt.config.VolumePath = filepath.Join(config.GraphRoot, "volumes")
+			rt.configuredFrom.volPathSet = true
+
 			setField = true
 		}
 
@@ -359,6 +364,7 @@ func WithVolumePath(volPath string) RuntimeOption {
 		}
 
 		rt.config.VolumePath = volPath
+		rt.configuredFrom.volPathSet = true
 
 		return nil
 	}
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 52f4523ba..827c22f5b 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -123,7 +123,10 @@ type RuntimeConfig struct {
 	// Not included in on-disk config, use the dedicated containers/storage
 	// configuration file instead
 	StorageConfig storage.StoreOptions `toml:"-"`
-	VolumePath    string               `toml:"volume_path"`
+	// VolumePath is the default location that named volumes will be created
+	// under. This convention is followed by the default volume driver, but
+	// may not be by other drivers.
+	VolumePath string `toml:"volume_path"`
 	// ImageDefaultTransport is the default transport method used to fetch
 	// images
 	ImageDefaultTransport string `toml:"image_default_transport"`
@@ -232,12 +235,14 @@ type runtimeConfiguredFrom struct {
 	storageRunRootSet     bool
 	libpodStaticDirSet    bool
 	libpodTmpDirSet       bool
+	volPathSet            bool
 }
 
 var (
 	defaultRuntimeConfig = RuntimeConfig{
 		// Leave this empty so containers/storage will use its defaults
 		StorageConfig:         storage.StoreOptions{},
+		VolumePath:            filepath.Join(storage.DefaultStoreOptions.GraphRoot, "volumes"),
 		ImageDefaultTransport: DefaultTransport,
 		StateType:             BoltDBStateStore,
 		OCIRuntime:            "runc",
@@ -400,6 +405,9 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) {
 		if tmpConfig.TmpDir != "" {
 			runtime.configuredFrom.libpodTmpDirSet = true
 		}
+		if tmpConfig.VolumePath != "" {
+			runtime.configuredFrom.volPathSet = true
+		}
 
 		if _, err := toml.Decode(string(contents), runtime.config); err != nil {
 			return nil, errors.Wrapf(err, "error decoding configuration file %s", configPath)
@@ -624,29 +632,52 @@ func makeRuntime(runtime *Runtime) (err error) {
 	if !runtime.configuredFrom.storageGraphDriverSet && dbConfig.GraphDriver != "" {
 		if runtime.config.StorageConfig.GraphDriverName != dbConfig.GraphDriver &&
 			runtime.config.StorageConfig.GraphDriverName != "" {
-			logrus.Errorf("User-selected graph driver %s overwritten by graph driver %s from database - delete libpod local files to resolve",
+			logrus.Errorf("User-selected graph driver %q overwritten by graph driver %q from database - delete libpod local files to resolve",
 				runtime.config.StorageConfig.GraphDriverName, dbConfig.GraphDriver)
 		}
 		runtime.config.StorageConfig.GraphDriverName = dbConfig.GraphDriver
 	}
 	if !runtime.configuredFrom.storageGraphRootSet && dbConfig.StorageRoot != "" {
+		if runtime.config.StorageConfig.GraphRoot != dbConfig.StorageRoot &&
+			runtime.config.StorageConfig.GraphRoot != "" {
+			logrus.Debugf("Overriding graph root %q with %q from database",
+				runtime.config.StorageConfig.GraphRoot, dbConfig.StorageRoot)
+		}
 		runtime.config.StorageConfig.GraphRoot = dbConfig.StorageRoot
 	}
 	if !runtime.configuredFrom.storageRunRootSet && dbConfig.StorageTmp != "" {
+		if runtime.config.StorageConfig.RunRoot != dbConfig.StorageTmp &&
+			runtime.config.StorageConfig.RunRoot != "" {
+			logrus.Debugf("Overriding run root %q with %q from database",
+				runtime.config.StorageConfig.RunRoot, dbConfig.StorageTmp)
+		}
 		runtime.config.StorageConfig.RunRoot = dbConfig.StorageTmp
 	}
 	if !runtime.configuredFrom.libpodStaticDirSet && dbConfig.LibpodRoot != "" {
+		if runtime.config.StaticDir != dbConfig.LibpodRoot && runtime.config.StaticDir != "" {
+			logrus.Debugf("Overriding static dir %q with %q from database", runtime.config.StaticDir, dbConfig.LibpodRoot)
+		}
 		runtime.config.StaticDir = dbConfig.LibpodRoot
 	}
 	if !runtime.configuredFrom.libpodTmpDirSet && dbConfig.LibpodTmp != "" {
+		if runtime.config.TmpDir != dbConfig.LibpodTmp && runtime.config.TmpDir != "" {
+			logrus.Debugf("Overriding tmp dir %q with %q from database", runtime.config.TmpDir, dbConfig.LibpodTmp)
+		}
 		runtime.config.TmpDir = dbConfig.LibpodTmp
 	}
+	if !runtime.configuredFrom.volPathSet && dbConfig.VolumePath != "" {
+		if runtime.config.VolumePath != dbConfig.VolumePath && runtime.config.VolumePath != "" {
+			logrus.Debugf("Overriding volume path %q with %q from database", runtime.config.VolumePath, dbConfig.VolumePath)
+		}
+		runtime.config.VolumePath = dbConfig.VolumePath
+	}
 
 	logrus.Debugf("Using graph driver %s", runtime.config.StorageConfig.GraphDriverName)
 	logrus.Debugf("Using graph root %s", runtime.config.StorageConfig.GraphRoot)
 	logrus.Debugf("Using run root %s", runtime.config.StorageConfig.RunRoot)
 	logrus.Debugf("Using static dir %s", runtime.config.StaticDir)
 	logrus.Debugf("Using tmp dir %s", runtime.config.TmpDir)
+	logrus.Debugf("Using volume path %s", runtime.config.VolumePath)
 
 	// Validate our config against the database, now that we've set our
 	// final storage configuration
diff --git a/libpod/state.go b/libpod/state.go
index 98282fc83..4296fc3cd 100644
--- a/libpod/state.go
+++ b/libpod/state.go
@@ -8,6 +8,7 @@ type DBConfig struct {
 	StorageRoot string
 	StorageTmp  string
 	GraphDriver string
+	VolumePath  string
 }
 
 // State is a storage backend for libpod's current state.