From: Sage Weil Date: Fri, 21 Jun 2013 01:29:43 +0000 (-0700) Subject: upgrade: refactor single-hop fs tests X-Git-Tag: v0.94.10~27^2^2~685 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=827d2f81fa0b3c3cc14103789ec364c88f9c7d41;p=ceph.git upgrade: refactor single-hop fs tests --- diff --git a/suites/upgrade/fs/0-cluster/start.yaml b/suites/upgrade/fs/0-cluster/start.yaml new file mode 100644 index 0000000000000..01747e4205612 --- /dev/null +++ b/suites/upgrade/fs/0-cluster/start.yaml @@ -0,0 +1,10 @@ +roles: +- - mon.a + - mds.a + - osd.0 + - osd.1 +- - mon.b + - mon.c + - osd.2 + - osd.3 +- - client.0 diff --git a/suites/upgrade/fs/1-bobtail-install/bobtail.yaml b/suites/upgrade/fs/1-bobtail-install/bobtail.yaml new file mode 100644 index 0000000000000..f76c8410ce0e3 --- /dev/null +++ b/suites/upgrade/fs/1-bobtail-install/bobtail.yaml @@ -0,0 +1,5 @@ +tasks: +- install: + branch: bobtail +- ceph: +- ceph-fuse: diff --git a/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml b/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml new file mode 100644 index 0000000000000..830893e50d144 --- /dev/null +++ b/suites/upgrade/fs/2-bobtail-workload/blogbench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: bobtail + clients: + client.0: + - suites/blogbench.sh diff --git a/suites/upgrade/fs/2-bobtail-workload/dbench.yaml b/suites/upgrade/fs/2-bobtail-workload/dbench.yaml new file mode 100644 index 0000000000000..d3aac66d660db --- /dev/null +++ b/suites/upgrade/fs/2-bobtail-workload/dbench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: bobtail + clients: + all: + - suites/dbench.sh diff --git a/suites/upgrade/fs/2-bobtail-workload/iogen.yaml b/suites/upgrade/fs/2-bobtail-workload/iogen.yaml new file mode 100644 index 0000000000000..77ce8026d0d6d --- /dev/null +++ b/suites/upgrade/fs/2-bobtail-workload/iogen.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: bobtail + clients: + client.0: + - suites/iogen.sh diff --git a/suites/upgrade/fs/3-upgrade/next.yaml b/suites/upgrade/fs/3-upgrade/next.yaml new file mode 100644 index 0000000000000..3e8e04cadbf05 --- /dev/null +++ b/suites/upgrade/fs/3-upgrade/next.yaml @@ -0,0 +1,4 @@ +tasks: +- install.upgrade: + all: + branch: next diff --git a/suites/upgrade/fs/4-restart/mds-mon-osd.yaml b/suites/upgrade/fs/4-restart/mds-mon-osd.yaml new file mode 100644 index 0000000000000..d21800684d333 --- /dev/null +++ b/suites/upgrade/fs/4-restart/mds-mon-osd.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/fs/4-restart/mon-mds-osd.yaml b/suites/upgrade/fs/4-restart/mon-mds-osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/fs/4-restart/mon-mds-osd.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] diff --git a/suites/upgrade/fs/4-restart/osd-mds-mon.yaml b/suites/upgrade/fs/4-restart/osd-mds-mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/fs/4-restart/osd-mds-mon.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/fs/5-next-workload/fsstress.yaml b/suites/upgrade/fs/5-next-workload/fsstress.yaml new file mode 100644 index 0000000000000..101b1ca5b0f3b --- /dev/null +++ b/suites/upgrade/fs/5-next-workload/fsstress.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + client.0: + - suites/fsstress.sh diff --git a/suites/upgrade/fs/5-next-workload/iogen.yaml b/suites/upgrade/fs/5-next-workload/iogen.yaml new file mode 100644 index 0000000000000..247d8072dae69 --- /dev/null +++ b/suites/upgrade/fs/5-next-workload/iogen.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/iogen.sh diff --git a/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml b/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml new file mode 100644 index 0000000000000..7415dd9b4e27a --- /dev/null +++ b/suites/upgrade/fs/5-next-workload/kernel-untar-build.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - kernel_untar_build.sh diff --git a/suites/upgrade/fs/5-next-workload/tiobench.yaml b/suites/upgrade/fs/5-next-workload/tiobench.yaml new file mode 100644 index 0000000000000..20e99edb19f80 --- /dev/null +++ b/suites/upgrade/fs/5-next-workload/tiobench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/tiobench.sh diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml b/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml deleted file mode 100644 index 8ae2bccc0a7be..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mds_first_blogbench_fsstress.yaml +++ /dev/null @@ -1,29 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - branch: bobtail - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - client.0: - - suites/fsstress.sh diff --git a/suites/upgrade/fs/tasks/upgrade_mds_first_cuttlefish_next.yaml b/suites/upgrade/fs/tasks/upgrade_mds_first_cuttlefish_next.yaml deleted file mode 100644 index d54350c35b1ae..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mds_first_cuttlefish_next.yaml +++ /dev/null @@ -1,29 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: cuttlefish -- ceph: -- ceph-fuse: -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - client.0: - - suites/fsstress.sh diff --git a/suites/upgrade/fs/tasks/upgrade_mds_mon_b_c_next.yaml b/suites/upgrade/fs/tasks/upgrade_mds_mon_b_c_next.yaml deleted file mode 100644 index 7f5fd7de35148..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mds_mon_b_c_next.yaml +++ /dev/null @@ -1,36 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - client.0: - - suites/iogen.sh -- install.upgrade: - all: - branch: cuttlefish -- ceph.restart: [mds.a, mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] -- workunit: - branch: next - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/upgrade/fs/tasks/upgrade_mon_first_cuttlefish_next.yaml b/suites/upgrade/fs/tasks/upgrade_mon_first_cuttlefish_next.yaml deleted file mode 100644 index f1e30d4d41c30..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_first_cuttlefish_next.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: cuttlefish -- ceph: -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/iogen.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml b/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml deleted file mode 100644 index deb9210ed2ade..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_first_dbench_untar.yaml +++ /dev/null @@ -1,31 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: - log-whitelist: - - wrongly marked -- ceph-fuse: -- workunit: - branch: bobtail - clients: - all: - - suites/dbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - branch: next - clients: - all: - - kernel_untar_build.sh diff --git a/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml b/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml deleted file mode 100644 index 326add4472dda..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_first_iogen_trivialsync.yaml +++ /dev/null @@ -1,27 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - client.0: - - suites/iogen.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/upgrade/fs/tasks/upgrade_mon_mds_b_c_next.yaml b/suites/upgrade/fs/tasks/upgrade_mon_mds_b_c_next.yaml deleted file mode 100644 index faccaf283f038..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_mds_b_c_next.yaml +++ /dev/null @@ -1,36 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - client.0: - - suites/iogen.sh -- install.upgrade: - all: - branch: cuttlefish -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - all: [misc/trivial_sync.sh] diff --git a/suites/upgrade/fs/tasks/upgrade_mon_osd_b_c_next.yaml b/suites/upgrade/fs/tasks/upgrade_mon_osd_b_c_next.yaml deleted file mode 100644 index 14c4fdd472421..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_osd_b_c_next.yaml +++ /dev/null @@ -1,37 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - client.0: - - suites/iogen.sh -- install.upgrade: - all: - branch: cuttlefish -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/dbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - branch: next - clients: - all: - - kernel_untar_build.sh diff --git a/suites/upgrade/fs/tasks/upgrade_mon_osd_cuttlefish_next.yaml b/suites/upgrade/fs/tasks/upgrade_mon_osd_cuttlefish_next.yaml deleted file mode 100644 index 7bb403623d35a..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_mon_osd_cuttlefish_next.yaml +++ /dev/null @@ -1,31 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: cuttlefish -- ceph: - log-whitelist: - - wrongly marked -- ceph-fuse: -- workunit: - branch: cuttlefish - clients: - all: - - suites/dbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, osd.3, mds.a] -- workunit: - branch: next - clients: - all: - - kernel_untar_build.sh diff --git a/suites/upgrade/fs/tasks/upgrade_osd_first_cuttlefish_next.yaml b/suites/upgrade/fs/tasks/upgrade_osd_first_cuttlefish_next.yaml deleted file mode 100644 index 359503bebe020..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_first_cuttlefish_next.yaml +++ /dev/null @@ -1,29 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: cuttlefish -- ceph: -- ceph-fuse: -- workunit: - branch: cuttlefish - clients: - all: - - suites/iozone.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] -- workunit: - branch: next - clients: - all: - - suites/iogen.sh diff --git a/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml b/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml deleted file mode 100644 index 67010bad7c0e4..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_first_dbench_tiobench.yaml +++ /dev/null @@ -1,28 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - all: - - suites/dbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - branch: next - clients: - all: - - suites/tiobench.sh diff --git a/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml b/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml deleted file mode 100644 index 8be4c5541289f..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_first_iozone_iogen.yaml +++ /dev/null @@ -1,29 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- ceph-fuse: -- workunit: - branch: bobtail - clients: - all: - - suites/iozone.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mds.a, mon.a, mon.b, mon.c] -- workunit: - branch: next - clients: - all: - - suites/iogen.sh diff --git a/suites/upgrade/fs/tasks/upgrade_osd_mds_b_c_next.yaml b/suites/upgrade/fs/tasks/upgrade_osd_mds_b_c_next.yaml deleted file mode 100644 index 9b10ab1881ae9..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_mds_b_c_next.yaml +++ /dev/null @@ -1,37 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - all: - - suites/iozone.sh -- install.upgrade: - all: - branch: cuttlefish -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: cuttlefish - clients: - all: - - suites/iogen.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] -- workunit: - branch: next - clients: - client.0: - - suites/blogbench.sh diff --git a/suites/upgrade/fs/tasks/upgrade_osd_mon_b_c_next.yaml b/suites/upgrade/fs/tasks/upgrade_osd_mon_b_c_next.yaml deleted file mode 100644 index 92c5bc13a10f2..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_mon_b_c_next.yaml +++ /dev/null @@ -1,37 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: bobtail -- ceph: -- workunit: - branch: bobtail - clients: - client.0: - - suites/dbench.sh -- install.upgrade: - all: - branch: cuttlefish -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - branch: cuttlefish - clients: - client.0: - - suites/blogbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - branch: next - clients: - all: [misc/trivial_sync.sh] - diff --git a/suites/upgrade/fs/tasks/upgrade_osd_mon_cuttlefish_next.yaml b/suites/upgrade/fs/tasks/upgrade_osd_mon_cuttlefish_next.yaml deleted file mode 100644 index 253864178a518..0000000000000 --- a/suites/upgrade/fs/tasks/upgrade_osd_mon_cuttlefish_next.yaml +++ /dev/null @@ -1,28 +0,0 @@ -roles: -- - mon.a - - mds.a - - osd.0 - - osd.1 -- - mon.b - - mon.c - - osd.2 - - osd.3 -- - client.0 -tasks: -- install: - branch: cuttlefish -- ceph: -- workunit: - branch: cuttlefish - clients: - all: - - suites/dbench.sh -- install.upgrade: - all: - branch: next -- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] -- workunit: - branch: next - clients: - all: - - suites/tiobench.sh