From: Ilya Dryomov <idryomov@gmail.com>
Date: Sat, 30 Sep 2023 09:39:32 +0000 (+0200)
Subject: qa/suites/rbd: deduplicate (data) pool facets
X-Git-Tag: v18.2.1~74^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65087401119bb155cf2ee8a728fe42c288ea25e0;p=ceph-ci.git

qa/suites/rbd: deduplicate (data) pool facets

With cache tiering facets gone, "pool" facets are strictly about
--data-pool option now.  Rename to "data-pool" and create symlinks
to a common directory.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 83880580aa15a12fb238a8da2e9355da9cf69cbf)
---

diff --git a/qa/rbd/data-pool/ec.yaml b/qa/rbd/data-pool/ec.yaml
new file mode 100644
index 00000000000..db289c7e7e6
--- /dev/null
+++ b/qa/rbd/data-pool/ec.yaml
@@ -0,0 +1,27 @@
+tasks:
+- exec:
+    client.0:
+      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
+      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
+      - sudo ceph osd pool set datapool allow_ec_overwrites true
+      - rbd pool init datapool
+
+overrides:
+  thrashosds:
+    bdev_inject_crash: 2
+    bdev_inject_crash_probability: .5
+  ceph:
+    fs: xfs
+    log-ignorelist:
+      - overall HEALTH_
+      - \(CACHE_POOL_NO_HIT_SET\)
+    conf:
+      client:
+        rbd default data pool: datapool
+      osd: # force bluestore since it's required for ec overwrites
+        osd objectstore: bluestore
+        bluestore block size: 96636764160
+        enable experimental unrecoverable data corrupting features: "*"
+        osd debug randomize hobject sort order: false
+# this doesn't work with failures bc the log writes are not atomic across the two backends
+#        bluestore bluefs env mirror: true
diff --git a/qa/rbd/data-pool/none.yaml b/qa/rbd/data-pool/none.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/rbd/data-pool/replicated.yaml b/qa/rbd/data-pool/replicated.yaml
new file mode 100644
index 00000000000..c5647dba1c6
--- /dev/null
+++ b/qa/rbd/data-pool/replicated.yaml
@@ -0,0 +1,11 @@
+tasks:
+- exec:
+    client.0:
+      - sudo ceph osd pool create datapool 4
+      - rbd pool init datapool
+
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default data pool: datapool
diff --git a/qa/suites/rbd/cli/data-pool b/qa/suites/rbd/cli/data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/cli/data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
\ No newline at end of file
diff --git a/qa/suites/rbd/cli/pool/.qa b/qa/suites/rbd/cli/pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/cli/pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/cli/pool/ec-data-pool.yaml b/qa/suites/rbd/cli/pool/ec-data-pool.yaml
deleted file mode 100644
index db289c7e7e6..00000000000
--- a/qa/suites/rbd/cli/pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    log-ignorelist:
-      - overall HEALTH_
-      - \(CACHE_POOL_NO_HIT_SET\)
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/cli/pool/none.yaml b/qa/suites/rbd/cli/pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rbd/cli/pool/replicated-data-pool.yaml b/qa/suites/rbd/cli/pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/cli/pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool
diff --git a/qa/suites/rbd/encryption/data-pool b/qa/suites/rbd/encryption/data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/encryption/data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
\ No newline at end of file
diff --git a/qa/suites/rbd/encryption/pool/.qa b/qa/suites/rbd/encryption/pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/encryption/pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/encryption/pool/ec-data-pool.yaml b/qa/suites/rbd/encryption/pool/ec-data-pool.yaml
deleted file mode 100644
index f39a5bb4ca6..00000000000
--- a/qa/suites/rbd/encryption/pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/encryption/pool/none.yaml b/qa/suites/rbd/encryption/pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rbd/encryption/pool/replicated-data-pool.yaml b/qa/suites/rbd/encryption/pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/encryption/pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool
diff --git a/qa/suites/rbd/librbd/data-pool b/qa/suites/rbd/librbd/data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/librbd/data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
\ No newline at end of file
diff --git a/qa/suites/rbd/librbd/pool/.qa b/qa/suites/rbd/librbd/pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/librbd/pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/librbd/pool/ec-data-pool.yaml b/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
deleted file mode 100644
index f39a5bb4ca6..00000000000
--- a/qa/suites/rbd/librbd/pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/librbd/pool/none.yaml b/qa/suites/rbd/librbd/pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml b/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/librbd/pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool
diff --git a/qa/suites/rbd/migration/5-data-pool b/qa/suites/rbd/migration/5-data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/migration/5-data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
\ No newline at end of file
diff --git a/qa/suites/rbd/migration/5-pool/.qa b/qa/suites/rbd/migration/5-pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/migration/5-pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml b/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml
deleted file mode 100644
index f39a5bb4ca6..00000000000
--- a/qa/suites/rbd/migration/5-pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/migration/5-pool/none.yaml b/qa/suites/rbd/migration/5-pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml b/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/migration/5-pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool
diff --git a/qa/suites/rbd/qemu/data-pool b/qa/suites/rbd/qemu/data-pool
new file mode 120000
index 00000000000..3df82757280
--- /dev/null
+++ b/qa/suites/rbd/qemu/data-pool
@@ -0,0 +1 @@
+.qa/rbd/data-pool/
\ No newline at end of file
diff --git a/qa/suites/rbd/qemu/pool/.qa b/qa/suites/rbd/qemu/pool/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/rbd/qemu/pool/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/rbd/qemu/pool/ec-data-pool.yaml b/qa/suites/rbd/qemu/pool/ec-data-pool.yaml
deleted file mode 100644
index f39a5bb4ca6..00000000000
--- a/qa/suites/rbd/qemu/pool/ec-data-pool.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd erasure-code-profile set teuthologyprofile crush-failure-domain=osd m=1 k=2
-      - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile
-      - sudo ceph osd pool set datapool allow_ec_overwrites true
-      - rbd pool init datapool
-
-overrides:
-  thrashosds:
-    bdev_inject_crash: 2
-    bdev_inject_crash_probability: .5
-  ceph:
-    fs: xfs
-    conf:
-      client:
-        rbd default data pool: datapool
-      osd: # force bluestore since it's required for ec overwrites
-        osd objectstore: bluestore
-        bluestore block size: 96636764160
-        enable experimental unrecoverable data corrupting features: "*"
-        osd debug randomize hobject sort order: false
-# this doesn't work with failures bc the log writes are not atomic across the two backends
-#        bluestore bluefs env mirror: true
diff --git a/qa/suites/rbd/qemu/pool/none.yaml b/qa/suites/rbd/qemu/pool/none.yaml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rbd/qemu/pool/replicated-data-pool.yaml b/qa/suites/rbd/qemu/pool/replicated-data-pool.yaml
deleted file mode 100644
index c5647dba1c6..00000000000
--- a/qa/suites/rbd/qemu/pool/replicated-data-pool.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- exec:
-    client.0:
-      - sudo ceph osd pool create datapool 4
-      - rbd pool init datapool
-
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd default data pool: datapool