Added blogbench.yaml to parallel before and after -x upgrade steps

Fixes #15093

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
index 879fa8aed24ed3e48add514fcff127587c1de90a..0d8f850e298f9c40c897d6be752f8dcf50f79bad 100644 (file)
--- a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
@@ -9,6 +9,8 @@ roles:
   - osd.3
 - - client.0
   - client.1
+  - client.2
+  - client.3
 overrides:
   ceph:
     log-whitelist:

diff --git a/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..8c9163e
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/2-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.2 before running workunit
+workload:
+  sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 2-workload"
+  - workunit:
+      clients:
+         client.2:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/hammer-x/parallel/5-final-workload/blogbench.yaml b/suites/upgrade/hammer-x/parallel/5-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..d2629c0
--- /dev/null
+++ b/suites/upgrade/hammer-x/parallel/5-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 5-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 5-final-workload"

diff --git a/suites/upgrade/infernalis-x/parallel/0-cluster/start.yaml b/suites/upgrade/infernalis-x/parallel/0-cluster/start.yaml
index 03bfebb4defce2048cead65aab9cc7dd65ae3b85..e73804ff4f3c39018917d4a6b5de3f89ac8f580d 100644 (file)
--- a/suites/upgrade/infernalis-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/infernalis-x/parallel/0-cluster/start.yaml
@@ -1,8 +1,9 @@
 meta:
 - desc: |
    Run ceph on two nodes,
-   with a separate client 0,1 third node. 
+   with a separate client 0,1,2 third node. 
    Use xfs beneath the osds.
+   CephFS tests running on client 2,3
 roles:
 - - mon.a
   - mds.a
@@ -14,6 +15,8 @@ roles:
   - osd.3
 - - client.0
   - client.1
+  - client.2
+  - client.3
 overrides:
   ceph:
     log-whitelist:

diff --git a/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml b/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..8c9163e
--- /dev/null
+++ b/suites/upgrade/infernalis-x/parallel/2-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.2 before running workunit
+workload:
+  sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 2-workload"
+  - workunit:
+      clients:
+         client.2:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 2-workload"

diff --git a/suites/upgrade/infernalis-x/parallel/5-final-workload/blogbench.yaml b/suites/upgrade/infernalis-x/parallel/5-final-workload/blogbench.yaml
new file mode 100644 (file)
index 0000000..d2629c0
--- /dev/null
+++ b/suites/upgrade/infernalis-x/parallel/5-final-workload/blogbench.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run a cephfs stress test
+   mount ceph-fuse on client.3 before running workunit
+tasks:
+- sequential:
+  - ceph-fuse:
+  - print: "**** done ceph-fuse 5-final-workload"
+  - workunit:
+      clients:
+         client.3:
+          - suites/blogbench.sh
+  - print: "**** done suites/blogbench.sh 5-final-workload"