The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7434
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From a8bfcae8e585f46c17231428e62d65f780adf628 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Tue, 26 May 2020 14:58:43 +0100
Subject: [PATCH 1/4] lxd/storage/utils: Removes unused name arg from
VolumeFillDefault
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/storage/utils.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go
index 9ebcef3531..4799f55d46 100644
--- a/lxd/storage/utils.go
+++ b/lxd/storage/utils.go
@@ -283,7 +283,7 @@ func VolumeValidateConfig(s *state.State, name string,
config map[string]string,
}
// VolumeFillDefault fills default settings into a volume config.
-func VolumeFillDefault(name string, config map[string]string, parentPool
*api.StoragePool) error {
+func VolumeFillDefault(config map[string]string, parentPool *api.StoragePool)
error {
if parentPool.Driver == "lvm" || parentPool.Driver == "ceph" {
if config["block.filesystem"] == "" {
config["block.filesystem"] =
parentPool.Config["volume.block.filesystem"]
From 7832dbcfb169d12aa65f0cdb4bd3902da20a8644 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Tue, 26 May 2020 15:01:22 +0100
Subject: [PATCH 2/4] lxd/instance/drivers: storagePools.VolumeFillDefault
usage
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/instance/drivers/driver_lxc.go | 2 +-
lxd/instance/drivers/driver_qemu.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxd/instance/drivers/driver_lxc.go
b/lxd/instance/drivers/driver_lxc.go
index 96a598528a..57a8ebc981 100644
--- a/lxd/instance/drivers/driver_lxc.go
+++ b/lxd/instance/drivers/driver_lxc.go
@@ -227,7 +227,7 @@ func lxcCreate(s *state.State, args db.InstanceArgs)
(instance.Instance, error)
// Fill in any default volume config
volumeConfig := map[string]string{}
- err = storagePools.VolumeFillDefault(storagePool, volumeConfig, dbPool)
+ err = storagePools.VolumeFillDefault(volumeConfig, dbPool)
if err != nil {
c.Delete()
return nil, err
diff --git a/lxd/instance/drivers/driver_qemu.go
b/lxd/instance/drivers/driver_qemu.go
index c4929da408..f798c7239c 100644
--- a/lxd/instance/drivers/driver_qemu.go
+++ b/lxd/instance/drivers/driver_qemu.go
@@ -240,7 +240,7 @@ func qemuCreate(s *state.State, args db.InstanceArgs)
(instance.Instance, error)
// Fill in any default volume config.
volumeConfig := map[string]string{}
- err = storagePools.VolumeFillDefault(storagePool, volumeConfig, pool)
+ err = storagePools.VolumeFillDefault(volumeConfig, pool)
if err != nil {
return nil, err
}
From 987968f54a06b6fcfbe4bb894a6e2fd3e6d3c173 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Tue, 26 May 2020 15:01:02 +0100
Subject: [PATCH 3/4] lxd/patches: driver.VolumeFillDefault usage
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/patches.go | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lxd/patches.go b/lxd/patches.go
index 34827c8df7..4dfeca8025 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -556,7 +556,7 @@ func upgradeFromStorageTypeBtrfs(name string, d *Daemon,
defaultPoolName string,
// Initialize empty storage volume configuration for the
// container.
containerPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(ct, containerPoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(containerPoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -644,7 +644,7 @@ func upgradeFromStorageTypeBtrfs(name string, d *Daemon,
defaultPoolName string,
// Initialize empty storage volume configuration for the
// container.
snapshotPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(cs,
snapshotPoolVolumeConfig, defaultPool)
+ err =
driver.VolumeFillDefault(snapshotPoolVolumeConfig, defaultPool)
if err != nil {
return err
}
@@ -725,7 +725,7 @@ func upgradeFromStorageTypeBtrfs(name string, d *Daemon,
defaultPoolName string,
images := append(imgPublic, imgPrivate...)
for _, img := range images {
imagePoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(img, imagePoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(imagePoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -846,7 +846,7 @@ func upgradeFromStorageTypeDir(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
containerPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(ct, containerPoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(containerPoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -963,7 +963,7 @@ func upgradeFromStorageTypeDir(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
snapshotPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(cs, snapshotPoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(snapshotPoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -993,7 +993,7 @@ func upgradeFromStorageTypeDir(name string, d *Daemon,
defaultPoolName string, d
images := append(imgPublic, imgPrivate...)
for _, img := range images {
imagePoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(img, imagePoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(imagePoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -1155,7 +1155,7 @@ func upgradeFromStorageTypeLvm(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
containerPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(ct, containerPoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(containerPoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -1316,7 +1316,7 @@ func upgradeFromStorageTypeLvm(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
snapshotPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(cs,
snapshotPoolVolumeConfig, defaultPool)
+ err =
driver.VolumeFillDefault(snapshotPoolVolumeConfig, defaultPool)
if err != nil {
return err
}
@@ -1499,7 +1499,7 @@ func upgradeFromStorageTypeLvm(name string, d *Daemon,
defaultPoolName string, d
for _, img := range images {
imagePoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(img, imagePoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(imagePoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -1691,7 +1691,7 @@ func upgradeFromStorageTypeZfs(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
containerPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(ct, containerPoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(containerPoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -1777,7 +1777,7 @@ func upgradeFromStorageTypeZfs(name string, d *Daemon,
defaultPoolName string, d
// Initialize empty storage volume configuration for the
// container.
snapshotPoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(cs,
snapshotPoolVolumeConfig, defaultPool)
+ err =
driver.VolumeFillDefault(snapshotPoolVolumeConfig, defaultPool)
if err != nil {
return err
}
@@ -1833,7 +1833,7 @@ func upgradeFromStorageTypeZfs(name string, d *Daemon,
defaultPoolName string, d
images := append(imgPublic, imgPrivate...)
for _, img := range images {
imagePoolVolumeConfig := map[string]string{}
- err = driver.VolumeFillDefault(img, imagePoolVolumeConfig,
defaultPool)
+ err = driver.VolumeFillDefault(imagePoolVolumeConfig,
defaultPool)
if err != nil {
return err
}
@@ -2325,7 +2325,7 @@ func patchStorageApiUpdateStorageConfigs(name string, d
*Daemon) error {
}
// Insert default values.
- err := driver.VolumeFillDefault(volume.Name,
volume.Config, pool)
+ err := driver.VolumeFillDefault(volume.Config, pool)
if err != nil {
return err
}
@@ -2486,7 +2486,7 @@ func patchStorageApiDetectLVSize(name string, d *Daemon)
error {
volume.Config = map[string]string{}
// Insert default values.
- err := driver.VolumeFillDefault(volume.Name,
volume.Config, pool)
+ err := driver.VolumeFillDefault(volume.Config,
pool)
if err != nil {
return err
}
From feb360f7d653ff02743443d1607ec1eb4215250a Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parr...@canonical.com>
Date: Tue, 26 May 2020 15:20:06 +0100
Subject: [PATCH 4/4] lxd/storage/utils: VolumeFillDefault usage
Signed-off-by: Thomas Parrott <thomas.parr...@canonical.com>
---
lxd/storage/utils.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lxd/storage/utils.go b/lxd/storage/utils.go
index 4799f55d46..279282152b 100644
--- a/lxd/storage/utils.go
+++ b/lxd/storage/utils.go
@@ -150,7 +150,7 @@ func VolumeDBCreate(s *state.State, project, poolName,
volumeName, volumeDescrip
return err
}
- err = VolumeFillDefault(poolName, volumeConfig, poolStruct)
+ err = VolumeFillDefault(volumeConfig, poolStruct)
if err != nil {
return err
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
