[lxc-devel] [lxd/master] Update for newer ZFS releases

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171106/30f43431/attachment.bin>
-------------- next part --------------
From caaa92bd2df9bdbea7039521f0846f3802a64b86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Mon, 6 Nov 2017 13:59:32 -0500
Subject: [PATCH] Update for newer ZFS releases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #3986

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/storage_zfs_utils.go    | 2 +-
 test/suites/init_auto.sh    | 4 ++--
 test/suites/init_preseed.sh | 2 +-
 test/suites/storage.sh      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxd/storage_zfs_utils.go b/lxd/storage_zfs_utils.go
index 79e5475ff..acc333baa 100644
--- a/lxd/storage_zfs_utils.go
+++ b/lxd/storage_zfs_utils.go
@@ -74,7 +74,7 @@ func zfsPoolCreate(pool string, vdev string) error {
 		}
 	} else {
 		output, err = shared.RunCommand(
-			"zpool", "create", pool, vdev, "-f", "-m", "none", "-O", "compression=on")
+			"zpool", "create", "-f", "-m", "none", "-O", "compression=on", pool, vdev)
 		if err != nil {
 			logger.Errorf("zfs create failed: %s.", output)
 			return fmt.Errorf("Failed to create the ZFS pool: %s", output)
diff --git a/test/suites/init_auto.sh b/test/suites/init_auto.sh
index 993885d24..e3db395ef 100644
--- a/test/suites/init_auto.sh
+++ b/test/suites/init_auto.sh
@@ -14,7 +14,7 @@ test_init_auto() {
 
     configure_loop_device loop_file_1 loop_device_1
     # shellcheck disable=SC2154
-    zpool create "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool" "${loop_device_1}" -m none -O compression=on
+    zpool create -m none -O compression=on "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool" "${loop_device_1}"
     LXD_DIR=${LXD_INIT_DIR} lxd init --auto --storage-backend zfs --storage-pool "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool"
     LXD_DIR=${LXD_INIT_DIR} lxc profile show default | grep -q "pool: default"
 
@@ -28,7 +28,7 @@ test_init_auto() {
 
     # shellcheck disable=SC2154
     configure_loop_device loop_file_1 loop_device_1
-    zpool create "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool" "${loop_device_1}" -m none -O compression=on
+    zpool create -m none -O compression=on "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool" "${loop_device_1}"
     LXD_DIR=${LXD_INIT_DIR} lxd init --auto --storage-backend zfs --storage-pool "lxdtest-$(basename "${LXD_DIR}")-pool1-existing-pool/non-existing-dataset"
 
     kill_lxd "${LXD_INIT_DIR}"
diff --git a/test/suites/init_preseed.sh b/test/suites/init_preseed.sh
index eb65c1670..e078304e0 100644
--- a/test/suites/init_preseed.sh
+++ b/test/suites/init_preseed.sh
@@ -15,7 +15,7 @@ test_init_preseed() {
     if [ "$lxd_backend" = "zfs" ]; then
         configure_loop_device loop_file_4 loop_device_4
         # shellcheck disable=SC2154
-        zpool create "lxdtest-$(basename "${LXD_DIR}")-preseed-pool" "${loop_device_4}" -f -m none -O compression=on
+        zpool create -f -m none -O compression=on "lxdtest-$(basename "${LXD_DIR}")-preseed-pool" "${loop_device_4}"
         driver="zfs"
         source="lxdtest-$(basename "${LXD_DIR}")-preseed-pool"
     elif [ "$lxd_backend" = "ceph" ]; then
diff --git a/test/suites/storage.sh b/test/suites/storage.sh
index fa059b3a4..c285896eb 100644
--- a/test/suites/storage.sh
+++ b/test/suites/storage.sh
@@ -64,7 +64,7 @@ test_storage() {
       # Let LXD use an already existing storage pool.
       configure_loop_device loop_file_4 loop_device_4
       # shellcheck disable=SC2154
-      zpool create "lxdtest-$(basename "${LXD_DIR}")-pool9-existing-pool" "${loop_device_4}" -f -m none -O compression=on
+      zpool create -f -m none -O compression=on "lxdtest-$(basename "${LXD_DIR}")-pool9-existing-pool" "${loop_device_4}"
       lxc storage create "lxdtest-$(basename "${LXD_DIR}")-pool9" zfs source="lxdtest-$(basename "${LXD_DIR}")-pool9-existing-pool"
 
       # Let LXD create a new dataset and use as pool.