From 029fdfd741a280bf5f2712fcd706f8d80a199782 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 15 Jun 2015 16:04:40 -0700 Subject: [PATCH] Initial checking for #12023 Signed-off-by: Yuri Weinstein --- suites/upgrade/hammer/{ => basic}/% | 0 .../hammer/{ => basic}/0-cluster/start.yaml | 0 .../1-install/latest_giant_release.yaml | 0 .../{ => basic}/2-workload/blogbench.yaml | 0 .../hammer/{ => basic}/2-workload/rbd.yaml | 0 .../{ => basic}/2-workload/s3tests.yaml | 0 .../{ => basic}/2-workload/testrados.yaml | 0 .../upgrade-mon-osd-mds.yaml | 0 .../upgrade-osd-mon-mds.yaml | 0 suites/upgrade/hammer/{ => basic}/4-final/+ | 0 .../hammer/{ => basic}/4-final/monthrash.yaml | 0 .../hammer/{ => basic}/4-final/osdthrash.yaml | 0 .../hammer/{ => basic}/4-final/testrgw.yaml | 0 suites/upgrade/hammer/basic/distros | 1 + suites/upgrade/hammer/distros | 1 - suites/upgrade/hammer/point-to-point/% | 0 suites/upgrade/hammer/point-to-point/distros | 1 + .../hammer/point-to-point/point-to-point.yaml | 160 ++++++++++++++++++ 18 files changed, 162 insertions(+), 1 deletion(-) rename suites/upgrade/hammer/{ => basic}/% (100%) rename suites/upgrade/hammer/{ => basic}/0-cluster/start.yaml (100%) rename suites/upgrade/hammer/{ => basic}/1-install/latest_giant_release.yaml (100%) rename suites/upgrade/hammer/{ => basic}/2-workload/blogbench.yaml (100%) rename suites/upgrade/hammer/{ => basic}/2-workload/rbd.yaml (100%) rename suites/upgrade/hammer/{ => basic}/2-workload/s3tests.yaml (100%) rename suites/upgrade/hammer/{ => basic}/2-workload/testrados.yaml (100%) rename suites/upgrade/hammer/{ => basic}/3-upgrade-sequence/upgrade-mon-osd-mds.yaml (100%) rename suites/upgrade/hammer/{ => basic}/3-upgrade-sequence/upgrade-osd-mon-mds.yaml (100%) rename suites/upgrade/hammer/{ => basic}/4-final/+ (100%) rename suites/upgrade/hammer/{ => basic}/4-final/monthrash.yaml (100%) rename suites/upgrade/hammer/{ => basic}/4-final/osdthrash.yaml (100%) rename suites/upgrade/hammer/{ => basic}/4-final/testrgw.yaml (100%) create mode 120000 suites/upgrade/hammer/basic/distros delete mode 120000 suites/upgrade/hammer/distros create mode 100644 suites/upgrade/hammer/point-to-point/% create mode 120000 suites/upgrade/hammer/point-to-point/distros create mode 100644 suites/upgrade/hammer/point-to-point/point-to-point.yaml diff --git a/suites/upgrade/hammer/% b/suites/upgrade/hammer/basic/% similarity index 100% rename from suites/upgrade/hammer/% rename to suites/upgrade/hammer/basic/% diff --git a/suites/upgrade/hammer/0-cluster/start.yaml b/suites/upgrade/hammer/basic/0-cluster/start.yaml similarity index 100% rename from suites/upgrade/hammer/0-cluster/start.yaml rename to suites/upgrade/hammer/basic/0-cluster/start.yaml diff --git a/suites/upgrade/hammer/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml similarity index 100% rename from suites/upgrade/hammer/1-install/latest_giant_release.yaml rename to suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml diff --git a/suites/upgrade/hammer/2-workload/blogbench.yaml b/suites/upgrade/hammer/basic/2-workload/blogbench.yaml similarity index 100% rename from suites/upgrade/hammer/2-workload/blogbench.yaml rename to suites/upgrade/hammer/basic/2-workload/blogbench.yaml diff --git a/suites/upgrade/hammer/2-workload/rbd.yaml b/suites/upgrade/hammer/basic/2-workload/rbd.yaml similarity index 100% rename from suites/upgrade/hammer/2-workload/rbd.yaml rename to suites/upgrade/hammer/basic/2-workload/rbd.yaml diff --git a/suites/upgrade/hammer/2-workload/s3tests.yaml b/suites/upgrade/hammer/basic/2-workload/s3tests.yaml similarity index 100% rename from suites/upgrade/hammer/2-workload/s3tests.yaml rename to suites/upgrade/hammer/basic/2-workload/s3tests.yaml diff --git a/suites/upgrade/hammer/2-workload/testrados.yaml b/suites/upgrade/hammer/basic/2-workload/testrados.yaml similarity index 100% rename from suites/upgrade/hammer/2-workload/testrados.yaml rename to suites/upgrade/hammer/basic/2-workload/testrados.yaml diff --git a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml similarity index 100% rename from suites/upgrade/hammer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml rename to suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml diff --git a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml similarity index 100% rename from suites/upgrade/hammer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml rename to suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml diff --git a/suites/upgrade/hammer/4-final/+ b/suites/upgrade/hammer/basic/4-final/+ similarity index 100% rename from suites/upgrade/hammer/4-final/+ rename to suites/upgrade/hammer/basic/4-final/+ diff --git a/suites/upgrade/hammer/4-final/monthrash.yaml b/suites/upgrade/hammer/basic/4-final/monthrash.yaml similarity index 100% rename from suites/upgrade/hammer/4-final/monthrash.yaml rename to suites/upgrade/hammer/basic/4-final/monthrash.yaml diff --git a/suites/upgrade/hammer/4-final/osdthrash.yaml b/suites/upgrade/hammer/basic/4-final/osdthrash.yaml similarity index 100% rename from suites/upgrade/hammer/4-final/osdthrash.yaml rename to suites/upgrade/hammer/basic/4-final/osdthrash.yaml diff --git a/suites/upgrade/hammer/4-final/testrgw.yaml b/suites/upgrade/hammer/basic/4-final/testrgw.yaml similarity index 100% rename from suites/upgrade/hammer/4-final/testrgw.yaml rename to suites/upgrade/hammer/basic/4-final/testrgw.yaml diff --git a/suites/upgrade/hammer/basic/distros b/suites/upgrade/hammer/basic/distros new file mode 120000 index 0000000000000..ca99fee94fa84 --- /dev/null +++ b/suites/upgrade/hammer/basic/distros @@ -0,0 +1 @@ +../../../../distros/supported/ \ No newline at end of file diff --git a/suites/upgrade/hammer/distros b/suites/upgrade/hammer/distros deleted file mode 120000 index dd0d7f1d5bdca..0000000000000 --- a/suites/upgrade/hammer/distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported/ \ No newline at end of file diff --git a/suites/upgrade/hammer/point-to-point/% b/suites/upgrade/hammer/point-to-point/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/hammer/point-to-point/distros b/suites/upgrade/hammer/point-to-point/distros new file mode 120000 index 0000000000000..ca99fee94fa84 --- /dev/null +++ b/suites/upgrade/hammer/point-to-point/distros @@ -0,0 +1 @@ +../../../../distros/supported/ \ No newline at end of file diff --git a/suites/upgrade/hammer/point-to-point/point-to-point.yaml b/suites/upgrade/hammer/point-to-point/point-to-point.yaml new file mode 100644 index 0000000000000..0d0afdc913ba3 --- /dev/null +++ b/suites/upgrade/hammer/point-to-point/point-to-point.yaml @@ -0,0 +1,160 @@ +overrides: + ceph: + log-whitelist: + - scrub + - osd_map_max_advance + fs: xfs + conf: + osd: + osd map max advance: 1000 +roles: +- - mon.a + - mds.a + - osd.0 + - osd.1 + - osd.2 +- - mon.b + - mon.c + - osd.3 + - osd.4 + - osd.5 + - client.0 +- - client.1 +tasks: +- print: "**** v0.94 about to install" +- install: + tag: v0.94 +- print: "**** done v0.94 install" +- ceph: + fs: xfs +- print: "**** done ceph xfs" +- sequential: + - workload +- print: "**** done workload v0.94" + +- parallel: + - workload1 + - upgrade-sequence1 +- print: "**** done parallel v0.94.2" + +- parallel: + - workload_hammer + - upgrade-sequence_hammer +- print: "**** done parallel hammer branch" +####################### +workload: + sequential: + - workunit: + clients: + client.0: + - suites/blogbench.sh + - print: "**** done suites/blogbench.sh workload" +workload1: + sequential: + - workunit: + clients: + client.0: + - rados/load-gen-big.sh + - print: "**** done rados/load-gen-big.sh workload1" + - workunit: + clients: + client.0: + - rados/test.sh + - cls + - print: "**** done rados/test.sh & cls workload1" + - workunit: + clients: + client.0: + - rbd/test_librbd.sh + - print: "**** done rbd/test_librbd.sh workload1" +upgrade-sequence1: + sequential: + - install.upgrade: + mon.a: + tag: v0.94.2 + mon.b: + tag: v0.94.2 + client.1: + tag: v0.94.2 + - print: "**** done v0.94.2 install.upgrade" + - ceph.restart: [mon.a] + - sleep: + duration: 60 + - ceph.restart: [mon.b] + - sleep: + duration: 60 + - ceph.restart: [mon.c] + - sleep: + duration: 60 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - ceph.restart: [osd.0] + - sleep: + duration: 30 + - ceph.restart: [osd.1] + - sleep: + duration: 30 + - ceph.restart: [osd.2] + - sleep: + duration: 30 + - ceph.restart: [osd.3] + - sleep: + duration: 30 + - ceph.restart: [osd.4] + - sleep: + duration: 30 + - ceph.restart: [osd.5] + - sleep: + duration: 30 + - print: "**** done ceph.restart all mon/mds/osd v0.94.2" +workload_hammer: + sequential: + - rgw: [client.0] + - print: "**** done rgw workload_hammer" + - s3tests: + client.0: + force-branch: hammer + rgw_server: client.0 + - print: "**** done s3tests workload_hammer" +upgrade-sequence_hammer: + sequential: + - install.upgrade: + mon.a: + branch: hammer + mon.b: + branch: hammer + client.1: + branch: hammer + - print: "**** done branch: hammer install.upgrade" + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - ceph.restart: [osd.0] + - sleep: + duration: 30 + - ceph.restart: [osd.1] + - sleep: + duration: 30 + - ceph.restart: [osd.2] + - sleep: + duration: 30 + - ceph.restart: [osd.3] + - sleep: + duration: 30 + - ceph.restart: [osd.4] + - sleep: + duration: 30 + - ceph.restart: [osd.5] + - sleep: + duration: 60 + - ceph.restart: [mon.a] + - sleep: + duration: 60 + - ceph.restart: [mon.b] + - sleep: + duration: 60 + - ceph.restart: [mon.c] + - sleep: + duration: 60 + - print: "**** done ceph.restart all hammer current branch mds/osd/mon" -- 2.39.5