Fixes #10704

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit a9252436e81ab7d21110ffbe2f6b469f08e47d82)

diff --git a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml
index 30aac173ce8ffd08c2caa9ffcf526671d4866d50..fcb90eed8425c3800676717173ee998f95b117f2 100644 (file)
--- a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml
@@ -9,6 +9,9 @@ roles:
   - osd.3
 - - client.0
   - client.1
+  - client.2
+  - client.3
+  - client.4
 overrides:
   ceph:
     log-whitelist:

diff --git a/suites/upgrade/giant-x/parallel/2-workload/+ b/suites/upgrade/giant-x/parallel/2-workload/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml
deleted file mode 120000 (symlink)
index a8a0ae6..0000000
--- a/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/+ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml
new file mode 120000 (symlink)
index 0000000..64b3cab
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml
@@ -0,0 +1 @@
+../../../../../../erasure-code/ec-rados-parallel.yaml
\ No newline at end of file

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml
new file mode 100644 (file)
index 0000000..b3c3bd4
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.1:
+            - cls
+    - print: "**** done cls 2-workload parallel"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..943bb83
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.2:
+            - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload parallel"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml
new file mode 100644 (file)
index 0000000..676a9e8
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml
@@ -0,0 +1,36 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - must scrub before tier agent can activate
+workload:
+  parallel:
+    - sequential:
+      - exec:
+          client.0:
+            - ceph osd pool create base 4
+            - ceph osd pool create cache 4
+            - ceph osd tier add base cache
+            - ceph osd tier cache-mode cache writeback
+            - ceph osd tier set-overlay base cache
+            - ceph osd pool set cache hit_set_type bloom
+            - ceph osd pool set cache hit_set_count 8
+            - ceph osd pool set cache hit_set_period 3600
+            - ceph osd pool set cache target_max_objects 250
+      - rados:
+          clients: [client.0]
+          pools: [base]
+          ops: 4000
+          objects: 500
+          pool_snaps: true
+          op_weights:
+            read: 100
+            write: 100
+            delete: 50
+            copy_from: 50
+            flush: 50
+            try_flush: 50
+            evict: 50
+            snap_create: 50
+            snap_remove: 50
+            rollback: 50
+      - print: "**** done test_cache-pool-snaps 2-workload parallel_run"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..7fb4981
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.3:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload parallel"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..7ac5eaa
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.4:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload parallel"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml
deleted file mode 100644 (file)
index 5ed5535..0000000
--- a/suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-        branch: giant
-        clients:
-          client.0:
-            - cls
-    - print: "**** done cls 2-workload"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml
deleted file mode 100644 (file)
index 0c430fe..0000000
--- a/suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-        branch: giant
-        clients:
-          client.0:
-            - rados/load-gen-big.sh
-    - print: "**** done rados/load-gen-big.sh 2-workload"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml
new file mode 120000 (symlink)
index 0000000..fc05f58
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml
@@ -0,0 +1 @@
+../../../../../../erasure-code/ec-rados-default.yaml
\ No newline at end of file

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml
new file mode 100644 (file)
index 0000000..f933060
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.1:
+            - cls
+    - print: "**** done cls 2-workload sequential"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml
new file mode 100644 (file)
index 0000000..7330f84
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.2:
+            - rados/load-gen-big.sh
+    - print: "**** done rados/load-gen-big.sh 2-workload sequential"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml
new file mode 100644 (file)
index 0000000..98e4b87
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml
@@ -0,0 +1,36 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - must scrub before tier agent can activate
+workload:
+  parallel:
+    - sequential:
+      - exec:
+          client.0:
+            - ceph osd pool create base 4
+            - ceph osd pool create cache 4
+            - ceph osd tier add base cache
+            - ceph osd tier cache-mode cache writeback
+            - ceph osd tier set-overlay base cache
+            - ceph osd pool set cache hit_set_type bloom
+            - ceph osd pool set cache hit_set_count 8
+            - ceph osd pool set cache hit_set_period 3600
+            - ceph osd pool set cache target_max_objects 250
+      - rados:
+          clients: [client.0]
+          pools: [base]
+          ops: 4000
+          objects: 500
+          pool_snaps: true
+          op_weights:
+            read: 100
+            write: 100
+            delete: 50
+            copy_from: 50
+            flush: 50
+            try_flush: 50
+            evict: 50
+            snap_create: 50
+            snap_remove: 50
+            rollback: 50
+      - print: "**** done test_cache-pool-snaps 2-workload sequential_run"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml
new file mode 100644 (file)
index 0000000..d8c1539
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.3:
+            - rbd/test_librbd.sh
+    - print: "**** done rbd/test_librbd.sh 2-workload sequential"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml
new file mode 100644 (file)
index 0000000..e62bcb5
--- /dev/null
+++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml
@@ -0,0 +1,8 @@
+workload:
+  sequential:
+    - workunit:
+        branch: giant
+        clients:
+          client.4:
+            - rbd/test_librbd_python.sh
+    - print: "**** done rbd/test_librbd_python.sh 2-workload sequential"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml
deleted file mode 100644 (file)
index efc1005..0000000
--- a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-        branch: giant
-        clients:
-          client.0:
-            - rbd/test_librbd.sh
-    - print: "**** done rbd/test_librbd.sh 2-workload"

diff --git a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml
deleted file mode 100644 (file)
index d5b1ac2..0000000
--- a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-workload:
-  sequential:
-    - workunit:
-        branch: giant
-        clients:
-          client.0:
-            - rbd/test_librbd_python.sh
-    - print: "**** done rbd/test_librbd_python.sh 2-workload"