Merge pull request #869 from ceph/wip-15093-jewel

Added blogbench.yaml to parallel before and after -x upgrade steps Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Mar 28, 2016 · 7e595e1 · 7e595e1
2 parents e541123 + 6122002
commit 7e595e1
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"