From: Yuri Weinstein Date: Mon, 15 Jun 2015 23:04:40 +0000 (-0700) Subject: Initial checking for #12023 X-Git-Tag: v10.2.6~165^2^2~456^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=029fdfd741a280bf5f2712fcd706f8d80a199782;p=ceph.git Initial checking for #12023 Signed-off-by: Yuri Weinstein --- diff --git a/suites/upgrade/hammer/% b/suites/upgrade/hammer/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/hammer/0-cluster/start.yaml b/suites/upgrade/hammer/0-cluster/start.yaml deleted file mode 100644 index 5f2f97159294..000000000000 --- a/suites/upgrade/hammer/0-cluster/start.yaml +++ /dev/null @@ -1,20 +0,0 @@ -overrides: - ceph: - log-whitelist: - - scrub - - scrub mismatch - - ScrubResult - fs: xfs -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 diff --git a/suites/upgrade/hammer/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/1-install/latest_giant_release.yaml deleted file mode 100644 index 0a7b9ec8a8cd..000000000000 --- a/suites/upgrade/hammer/1-install/latest_giant_release.yaml +++ /dev/null @@ -1,10 +0,0 @@ -tasks: -- install: - branch: giant -- print: "**** done latest giant install" -- ceph: - fs: xfs -- parallel: - - workload - - upgrade-sequence -- print: "**** done parallel" diff --git a/suites/upgrade/hammer/2-workload/blogbench.yaml b/suites/upgrade/hammer/2-workload/blogbench.yaml deleted file mode 100644 index e3d652eafd50..000000000000 --- a/suites/upgrade/hammer/2-workload/blogbench.yaml +++ /dev/null @@ -1,7 +0,0 @@ -workload: - sequential: - - workunit: - clients: - client.0: - - suites/blogbench.sh - - print: "**** done suites/blogbench.sh 2-workload" diff --git a/suites/upgrade/hammer/2-workload/rbd.yaml b/suites/upgrade/hammer/2-workload/rbd.yaml deleted file mode 100644 index 45fc83562987..000000000000 --- a/suites/upgrade/hammer/2-workload/rbd.yaml +++ /dev/null @@ -1,14 +0,0 @@ -workload: - sequential: - - workunit: - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format - - print: "**** done rbd/import_export.sh 2-workload" - - workunit: - clients: - client.0: - - cls/test_cls_rbd.sh - - print: "**** done cls/test_cls_rbd.sh 2-workload" diff --git a/suites/upgrade/hammer/2-workload/s3tests.yaml b/suites/upgrade/hammer/2-workload/s3tests.yaml deleted file mode 100644 index 43f56b7ad5e2..000000000000 --- a/suites/upgrade/hammer/2-workload/s3tests.yaml +++ /dev/null @@ -1,9 +0,0 @@ -workload: - sequential: - - rgw: [client.0] - - print: "**** done rgw: [client.0] 2-workload" - - s3tests: - client.0: - force-branch: firefly-original - rgw_server: client.0 - - print: "**** done s3tests 2-workload" diff --git a/suites/upgrade/hammer/2-workload/testrados.yaml b/suites/upgrade/hammer/2-workload/testrados.yaml deleted file mode 100644 index 49339ecd0441..000000000000 --- a/suites/upgrade/hammer/2-workload/testrados.yaml +++ /dev/null @@ -1,12 +0,0 @@ -workload: - rados: - clients: [client.0] - ops: 2000 - objects: 50 - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 diff --git a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml deleted file mode 100644 index fe55b51c777c..000000000000 --- a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ /dev/null @@ -1,37 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - all: - branch: hammer - - print: "**** done install.upgrade hammer" - - 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" diff --git a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml deleted file mode 100644 index 2835df08d503..000000000000 --- a/suites/upgrade/hammer/3-upgrade-sequence/upgrade-osd-mon-mds.yaml +++ /dev/null @@ -1,37 +0,0 @@ -upgrade-sequence: - sequential: - - install.upgrade: - all: - branch: hammer - - print: "**** done install.upgrade hammer" - - 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 - - ceph.restart: [mds.a] - - sleep: - duration: 60 - - print: "**** done ceph.restart all" diff --git a/suites/upgrade/hammer/4-final/+ b/suites/upgrade/hammer/4-final/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/suites/upgrade/hammer/4-final/monthrash.yaml b/suites/upgrade/hammer/4-final/monthrash.yaml deleted file mode 100644 index 3774702f08a4..000000000000 --- a/suites/upgrade/hammer/4-final/monthrash.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- mon_thrash: - revive_delay: 20 - thrash_delay: 1 -- print: "**** done mon_thrash 4-workload" -- ceph-fuse: -- print: "**** done ceph-fuse 4-workload" -- workunit: - clients: - client.0: - - suites/dbench.sh -- print: "**** done suites/dbench.sh 4-workload" - diff --git a/suites/upgrade/hammer/4-final/osdthrash.yaml b/suites/upgrade/hammer/4-final/osdthrash.yaml deleted file mode 100644 index b5acf4358143..000000000000 --- a/suites/upgrade/hammer/4-final/osdthrash.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - log-whitelist: - - wrongly marked me down - - objects unfound and apparently lost - - log bound mismatch -tasks: -- sequential: - - thrashosds: - timeout: 1200 - chance_pgnum_grow: 1 - chance_pgpnum_fix: 1 - - print: "**** done thrashosds 4-workload" - - workunit: - clients: - client.0: - - suites/iogen.sh - - print: "**** done suites/iogen.sh 4-workload" - diff --git a/suites/upgrade/hammer/4-final/testrgw.yaml b/suites/upgrade/hammer/4-final/testrgw.yaml deleted file mode 100644 index 7b2c2c3b3327..000000000000 --- a/suites/upgrade/hammer/4-final/testrgw.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- sequential: - - rgw: [client.1] - - print: "**** done rgw: [client.1] 4-workload" - - s3tests: - client.1: - rgw_server: client.1 - - print: "**** done s3tests 4-workload" diff --git a/suites/upgrade/hammer/basic/% b/suites/upgrade/hammer/basic/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/upgrade/hammer/basic/0-cluster/start.yaml b/suites/upgrade/hammer/basic/0-cluster/start.yaml new file mode 100644 index 000000000000..5f2f97159294 --- /dev/null +++ b/suites/upgrade/hammer/basic/0-cluster/start.yaml @@ -0,0 +1,20 @@ +overrides: + ceph: + log-whitelist: + - scrub + - scrub mismatch + - ScrubResult + fs: xfs +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 diff --git a/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml b/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml new file mode 100644 index 000000000000..0a7b9ec8a8cd --- /dev/null +++ b/suites/upgrade/hammer/basic/1-install/latest_giant_release.yaml @@ -0,0 +1,10 @@ +tasks: +- install: + branch: giant +- print: "**** done latest giant install" +- ceph: + fs: xfs +- parallel: + - workload + - upgrade-sequence +- print: "**** done parallel" diff --git a/suites/upgrade/hammer/basic/2-workload/blogbench.yaml b/suites/upgrade/hammer/basic/2-workload/blogbench.yaml new file mode 100644 index 000000000000..e3d652eafd50 --- /dev/null +++ b/suites/upgrade/hammer/basic/2-workload/blogbench.yaml @@ -0,0 +1,7 @@ +workload: + sequential: + - workunit: + clients: + client.0: + - suites/blogbench.sh + - print: "**** done suites/blogbench.sh 2-workload" diff --git a/suites/upgrade/hammer/basic/2-workload/rbd.yaml b/suites/upgrade/hammer/basic/2-workload/rbd.yaml new file mode 100644 index 000000000000..45fc83562987 --- /dev/null +++ b/suites/upgrade/hammer/basic/2-workload/rbd.yaml @@ -0,0 +1,14 @@ +workload: + sequential: + - workunit: + clients: + client.0: + - rbd/import_export.sh + env: + RBD_CREATE_ARGS: --new-format + - print: "**** done rbd/import_export.sh 2-workload" + - workunit: + clients: + client.0: + - cls/test_cls_rbd.sh + - print: "**** done cls/test_cls_rbd.sh 2-workload" diff --git a/suites/upgrade/hammer/basic/2-workload/s3tests.yaml b/suites/upgrade/hammer/basic/2-workload/s3tests.yaml new file mode 100644 index 000000000000..43f56b7ad5e2 --- /dev/null +++ b/suites/upgrade/hammer/basic/2-workload/s3tests.yaml @@ -0,0 +1,9 @@ +workload: + sequential: + - rgw: [client.0] + - print: "**** done rgw: [client.0] 2-workload" + - s3tests: + client.0: + force-branch: firefly-original + rgw_server: client.0 + - print: "**** done s3tests 2-workload" diff --git a/suites/upgrade/hammer/basic/2-workload/testrados.yaml b/suites/upgrade/hammer/basic/2-workload/testrados.yaml new file mode 100644 index 000000000000..49339ecd0441 --- /dev/null +++ b/suites/upgrade/hammer/basic/2-workload/testrados.yaml @@ -0,0 +1,12 @@ +workload: + rados: + clients: [client.0] + ops: 2000 + objects: 50 + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 diff --git a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml new file mode 100644 index 000000000000..fe55b51c777c --- /dev/null +++ b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -0,0 +1,37 @@ +upgrade-sequence: + sequential: + - install.upgrade: + all: + branch: hammer + - print: "**** done install.upgrade hammer" + - 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" diff --git a/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml new file mode 100644 index 000000000000..2835df08d503 --- /dev/null +++ b/suites/upgrade/hammer/basic/3-upgrade-sequence/upgrade-osd-mon-mds.yaml @@ -0,0 +1,37 @@ +upgrade-sequence: + sequential: + - install.upgrade: + all: + branch: hammer + - print: "**** done install.upgrade hammer" + - 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 + - ceph.restart: [mds.a] + - sleep: + duration: 60 + - print: "**** done ceph.restart all" diff --git a/suites/upgrade/hammer/basic/4-final/+ b/suites/upgrade/hammer/basic/4-final/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/suites/upgrade/hammer/basic/4-final/monthrash.yaml b/suites/upgrade/hammer/basic/4-final/monthrash.yaml new file mode 100644 index 000000000000..3774702f08a4 --- /dev/null +++ b/suites/upgrade/hammer/basic/4-final/monthrash.yaml @@ -0,0 +1,13 @@ +tasks: +- mon_thrash: + revive_delay: 20 + thrash_delay: 1 +- print: "**** done mon_thrash 4-workload" +- ceph-fuse: +- print: "**** done ceph-fuse 4-workload" +- workunit: + clients: + client.0: + - suites/dbench.sh +- print: "**** done suites/dbench.sh 4-workload" + diff --git a/suites/upgrade/hammer/basic/4-final/osdthrash.yaml b/suites/upgrade/hammer/basic/4-final/osdthrash.yaml new file mode 100644 index 000000000000..b5acf4358143 --- /dev/null +++ b/suites/upgrade/hammer/basic/4-final/osdthrash.yaml @@ -0,0 +1,19 @@ +overrides: + ceph: + log-whitelist: + - wrongly marked me down + - objects unfound and apparently lost + - log bound mismatch +tasks: +- sequential: + - thrashosds: + timeout: 1200 + chance_pgnum_grow: 1 + chance_pgpnum_fix: 1 + - print: "**** done thrashosds 4-workload" + - workunit: + clients: + client.0: + - suites/iogen.sh + - print: "**** done suites/iogen.sh 4-workload" + diff --git a/suites/upgrade/hammer/basic/4-final/testrgw.yaml b/suites/upgrade/hammer/basic/4-final/testrgw.yaml new file mode 100644 index 000000000000..7b2c2c3b3327 --- /dev/null +++ b/suites/upgrade/hammer/basic/4-final/testrgw.yaml @@ -0,0 +1,8 @@ +tasks: +- sequential: + - rgw: [client.1] + - print: "**** done rgw: [client.1] 4-workload" + - s3tests: + client.1: + rgw_server: client.1 + - print: "**** done s3tests 4-workload" diff --git a/suites/upgrade/hammer/basic/distros b/suites/upgrade/hammer/basic/distros new file mode 120000 index 000000000000..ca99fee94fa8 --- /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 dd0d7f1d5bdc..000000000000 --- 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 000000000000..e69de29bb2d1 diff --git a/suites/upgrade/hammer/point-to-point/distros b/suites/upgrade/hammer/point-to-point/distros new file mode 120000 index 000000000000..ca99fee94fa8 --- /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 000000000000..0d0afdc913ba --- /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"