From fbdb7774bb381ff1426650c47cdb36282c4c77d2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 20 Jun 2013 18:30:07 -0700 Subject: [PATCH] upgrade: add double-hop bobtail -> cuttlefish -> next fs tests --- suites/upgrade/fs-double/0-cluster/start.yaml | 10 ++++++++++ .../upgrade/fs-double/1-bobtail-install/bobtail.yaml | 5 +++++ .../fs-double/2-bobtail-workload/blogbench.yaml | 6 ++++++ .../upgrade/fs-double/2-bobtail-workload/dbench.yaml | 6 ++++++ suites/upgrade/fs-double/2-bobtail-workload/iogen.yaml | 6 ++++++ .../fs-double/3-upgrade-cuttlefish/cuttlefish.yaml | 4 ++++ suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml | 2 ++ suites/upgrade/fs-double/4-restart/mon-mds-osd.yaml | 2 ++ suites/upgrade/fs-double/4-restart/osd-mds-mon.yaml | 2 ++ .../fs-double/5-cuttlefish-workload/fsstress.yaml | 6 ++++++ .../upgrade/fs-double/5-cuttlefish-workload/iogen.yaml | 6 ++++++ .../5-cuttlefish-workload/kernel-untar-build.yaml | 6 ++++++ .../fs-double/5-cuttlefish-workload/tiobench.yaml | 6 ++++++ suites/upgrade/fs-double/6-upgrade-next/next.yaml | 4 ++++ suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml | 2 ++ suites/upgrade/fs-double/7-restart/mon-mds-osd.yaml | 2 ++ suites/upgrade/fs-double/7-restart/osd-mds-mon.yaml | 2 ++ suites/upgrade/fs-double/8-next-workload/fsstress.yaml | 6 ++++++ suites/upgrade/fs-double/8-next-workload/iogen.yaml | 6 ++++++ .../fs-double/8-next-workload/kernel-untar-build.yaml | 6 ++++++ suites/upgrade/fs-double/8-next-workload/tiobench.yaml | 6 ++++++ 21 files changed, 101 insertions(+) create mode 100644 suites/upgrade/fs-double/0-cluster/start.yaml create mode 100644 suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml create mode 100644 suites/upgrade/fs-double/2-bobtail-workload/blogbench.yaml create mode 100644 suites/upgrade/fs-double/2-bobtail-workload/dbench.yaml create mode 100644 suites/upgrade/fs-double/2-bobtail-workload/iogen.yaml create mode 100644 suites/upgrade/fs-double/3-upgrade-cuttlefish/cuttlefish.yaml create mode 100644 suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml create mode 100644 suites/upgrade/fs-double/4-restart/mon-mds-osd.yaml create mode 100644 suites/upgrade/fs-double/4-restart/osd-mds-mon.yaml create mode 100644 suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml create mode 100644 suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml create mode 100644 suites/upgrade/fs-double/5-cuttlefish-workload/kernel-untar-build.yaml create mode 100644 suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml create mode 100644 suites/upgrade/fs-double/6-upgrade-next/next.yaml create mode 100644 suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml create mode 100644 suites/upgrade/fs-double/7-restart/mon-mds-osd.yaml create mode 100644 suites/upgrade/fs-double/7-restart/osd-mds-mon.yaml create mode 100644 suites/upgrade/fs-double/8-next-workload/fsstress.yaml create mode 100644 suites/upgrade/fs-double/8-next-workload/iogen.yaml create mode 100644 suites/upgrade/fs-double/8-next-workload/kernel-untar-build.yaml create mode 100644 suites/upgrade/fs-double/8-next-workload/tiobench.yaml diff --git a/suites/upgrade/fs-double/0-cluster/start.yaml b/suites/upgrade/fs-double/0-cluster/start.yaml new file mode 100644 index 0000000000000..01747e4205612 --- /dev/null +++ b/suites/upgrade/fs-double/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-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml new file mode 100644 index 0000000000000..f76c8410ce0e3 --- /dev/null +++ b/suites/upgrade/fs-double/1-bobtail-install/bobtail.yaml @@ -0,0 +1,5 @@ +tasks: +- install: + branch: bobtail +- ceph: +- ceph-fuse: diff --git a/suites/upgrade/fs-double/2-bobtail-workload/blogbench.yaml b/suites/upgrade/fs-double/2-bobtail-workload/blogbench.yaml new file mode 100644 index 0000000000000..830893e50d144 --- /dev/null +++ b/suites/upgrade/fs-double/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-double/2-bobtail-workload/dbench.yaml b/suites/upgrade/fs-double/2-bobtail-workload/dbench.yaml new file mode 100644 index 0000000000000..d3aac66d660db --- /dev/null +++ b/suites/upgrade/fs-double/2-bobtail-workload/dbench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: bobtail + clients: + all: + - suites/dbench.sh diff --git a/suites/upgrade/fs-double/2-bobtail-workload/iogen.yaml b/suites/upgrade/fs-double/2-bobtail-workload/iogen.yaml new file mode 100644 index 0000000000000..77ce8026d0d6d --- /dev/null +++ b/suites/upgrade/fs-double/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-double/3-upgrade-cuttlefish/cuttlefish.yaml b/suites/upgrade/fs-double/3-upgrade-cuttlefish/cuttlefish.yaml new file mode 100644 index 0000000000000..4dee94e343e38 --- /dev/null +++ b/suites/upgrade/fs-double/3-upgrade-cuttlefish/cuttlefish.yaml @@ -0,0 +1,4 @@ +tasks: +- install.upgrade: + all: + branch: cuttlefish diff --git a/suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml b/suites/upgrade/fs-double/4-restart/mds-mon-osd.yaml new file mode 100644 index 0000000000000..d21800684d333 --- /dev/null +++ b/suites/upgrade/fs-double/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-double/4-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/4-restart/mon-mds-osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/fs-double/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-double/4-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/4-restart/osd-mds-mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/fs-double/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-double/5-cuttlefish-workload/fsstress.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml new file mode 100644 index 0000000000000..101b1ca5b0f3b --- /dev/null +++ b/suites/upgrade/fs-double/5-cuttlefish-workload/fsstress.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + client.0: + - suites/fsstress.sh diff --git a/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml new file mode 100644 index 0000000000000..247d8072dae69 --- /dev/null +++ b/suites/upgrade/fs-double/5-cuttlefish-workload/iogen.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/iogen.sh diff --git a/suites/upgrade/fs-double/5-cuttlefish-workload/kernel-untar-build.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/kernel-untar-build.yaml new file mode 100644 index 0000000000000..7415dd9b4e27a --- /dev/null +++ b/suites/upgrade/fs-double/5-cuttlefish-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-double/5-cuttlefish-workload/tiobench.yaml b/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml new file mode 100644 index 0000000000000..20e99edb19f80 --- /dev/null +++ b/suites/upgrade/fs-double/5-cuttlefish-workload/tiobench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/tiobench.sh diff --git a/suites/upgrade/fs-double/6-upgrade-next/next.yaml b/suites/upgrade/fs-double/6-upgrade-next/next.yaml new file mode 100644 index 0000000000000..3e8e04cadbf05 --- /dev/null +++ b/suites/upgrade/fs-double/6-upgrade-next/next.yaml @@ -0,0 +1,4 @@ +tasks: +- install.upgrade: + all: + branch: next diff --git a/suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/fs-double/7-restart/mds-mon-osd.yaml new file mode 100644 index 0000000000000..d21800684d333 --- /dev/null +++ b/suites/upgrade/fs-double/7-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-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/fs-double/7-restart/mon-mds-osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/fs-double/7-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-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/fs-double/7-restart/osd-mds-mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/fs-double/7-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-double/8-next-workload/fsstress.yaml b/suites/upgrade/fs-double/8-next-workload/fsstress.yaml new file mode 100644 index 0000000000000..101b1ca5b0f3b --- /dev/null +++ b/suites/upgrade/fs-double/8-next-workload/fsstress.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + client.0: + - suites/fsstress.sh diff --git a/suites/upgrade/fs-double/8-next-workload/iogen.yaml b/suites/upgrade/fs-double/8-next-workload/iogen.yaml new file mode 100644 index 0000000000000..247d8072dae69 --- /dev/null +++ b/suites/upgrade/fs-double/8-next-workload/iogen.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/iogen.sh diff --git a/suites/upgrade/fs-double/8-next-workload/kernel-untar-build.yaml b/suites/upgrade/fs-double/8-next-workload/kernel-untar-build.yaml new file mode 100644 index 0000000000000..7415dd9b4e27a --- /dev/null +++ b/suites/upgrade/fs-double/8-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-double/8-next-workload/tiobench.yaml b/suites/upgrade/fs-double/8-next-workload/tiobench.yaml new file mode 100644 index 0000000000000..20e99edb19f80 --- /dev/null +++ b/suites/upgrade/fs-double/8-next-workload/tiobench.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: next + clients: + all: + - suites/tiobench.sh -- 2.39.5