diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml index 879fa8aed24..0d8f850e298 100644 --- 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 index 00000000000..8c9163e98d0 --- /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 index 00000000000..d2629c03f68 --- /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 03bfebb4def..e73804ff4f3 100644 --- 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 index 00000000000..8c9163e98d0 --- /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 index 00000000000..d2629c03f68 --- /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"