From 56f9b29ec6edb4dce6c2f32c5c44fff1c7c1d7e5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 23 Jun 2013 21:58:30 -0700 Subject: [PATCH] upgrade: add rados-double suite (bobtail -> cuttlefish -> next) --- suites/upgrade/rados-double/0-cluster/start.yaml | 10 ++++++++++ .../rados-double/1-bobtail-install/bobtail.yaml | 4 ++++ .../upgrade/rados-double/2-bobtail-workload/api.yaml | 6 ++++++ .../upgrade/rados-double/3-upgrade/cuttlefish.yaml | 4 ++++ .../rados-double/4-restart/upgrade_mds_osd_mon.yaml | 2 ++ .../rados-double/4-restart/upgrade_mon_mds_osd.yaml | 2 ++ .../rados-double/4-restart/upgrade_osd_mds_mon.yaml | 2 ++ .../rados-double/4-restart/upgrade_osd_mon_mds.yaml | 2 ++ .../rados-double/5-cuttlefish-workload/api.yaml | 7 +++++++ .../5-cuttlefish-workload/load-gen-mix.yaml | 6 ++++++ suites/upgrade/rados-double/6-upgrade-next/next.yaml | 4 ++++ .../upgrade/rados-double/7-restart/mds-mon-osd.yaml | 2 ++ .../upgrade/rados-double/7-restart/mon-mds-osd.yaml | 2 ++ .../upgrade/rados-double/7-restart/osd-mds-mon.yaml | 2 ++ suites/upgrade/rados-double/8-next-workload/api.yaml | 7 +++++++ .../8-next-workload/snaps-few-objects.yaml | 12 ++++++++++++ 16 files changed, 74 insertions(+) create mode 100644 suites/upgrade/rados-double/0-cluster/start.yaml create mode 100644 suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml create mode 100644 suites/upgrade/rados-double/2-bobtail-workload/api.yaml create mode 100644 suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml create mode 100644 suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml create mode 100644 suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml create mode 100644 suites/upgrade/rados-double/4-restart/upgrade_osd_mds_mon.yaml create mode 100644 suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml create mode 100644 suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml create mode 100644 suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml create mode 100644 suites/upgrade/rados-double/6-upgrade-next/next.yaml create mode 100644 suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml create mode 100644 suites/upgrade/rados-double/7-restart/mon-mds-osd.yaml create mode 100644 suites/upgrade/rados-double/7-restart/osd-mds-mon.yaml create mode 100644 suites/upgrade/rados-double/8-next-workload/api.yaml create mode 100644 suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml diff --git a/suites/upgrade/rados-double/0-cluster/start.yaml b/suites/upgrade/rados-double/0-cluster/start.yaml new file mode 100644 index 0000000000000..01747e4205612 --- /dev/null +++ b/suites/upgrade/rados-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/rados-double/1-bobtail-install/bobtail.yaml b/suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml new file mode 100644 index 0000000000000..c676a5582d514 --- /dev/null +++ b/suites/upgrade/rados-double/1-bobtail-install/bobtail.yaml @@ -0,0 +1,4 @@ +tasks: +- install: + branch: bobtail +- ceph: diff --git a/suites/upgrade/rados-double/2-bobtail-workload/api.yaml b/suites/upgrade/rados-double/2-bobtail-workload/api.yaml new file mode 100644 index 0000000000000..637b7a8be9756 --- /dev/null +++ b/suites/upgrade/rados-double/2-bobtail-workload/api.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: bobtail + clients: + client.0: + - rados/test.sh diff --git a/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml b/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml new file mode 100644 index 0000000000000..4dee94e343e38 --- /dev/null +++ b/suites/upgrade/rados-double/3-upgrade/cuttlefish.yaml @@ -0,0 +1,4 @@ +tasks: +- install.upgrade: + all: + branch: cuttlefish diff --git a/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml new file mode 100644 index 0000000000000..a8508353e78cd --- /dev/null +++ b/suites/upgrade/rados-double/4-restart/upgrade_mds_osd_mon.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [mds.a, osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c] diff --git a/suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados-double/4-restart/upgrade_mon_mds_osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/rados-double/4-restart/upgrade_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/rados-double/4-restart/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados-double/4-restart/upgrade_osd_mds_mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/rados-double/4-restart/upgrade_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/rados-double/4-restart/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml new file mode 100644 index 0000000000000..e8fe288f657db --- /dev/null +++ b/suites/upgrade/rados-double/4-restart/upgrade_osd_mon_mds.yaml @@ -0,0 +1,2 @@ +tasks: +- ceph.restart: [osd.0, osd.1, osd.2, osd.3, mon.a, mon.b, mon.c, mds.a] diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml new file mode 100644 index 0000000000000..66526582579d9 --- /dev/null +++ b/suites/upgrade/rados-double/5-cuttlefish-workload/api.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + branch: cuttlefish + clients: + client.0: + - rados/test.sh + - cls diff --git a/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml new file mode 100644 index 0000000000000..7ec655c8ccfcb --- /dev/null +++ b/suites/upgrade/rados-double/5-cuttlefish-workload/load-gen-mix.yaml @@ -0,0 +1,6 @@ +tasks: +- workunit: + branch: cuttlefish + clients: + client.0: + - rados/load-gen-mix.sh diff --git a/suites/upgrade/rados-double/6-upgrade-next/next.yaml b/suites/upgrade/rados-double/6-upgrade-next/next.yaml new file mode 100644 index 0000000000000..3e8e04cadbf05 --- /dev/null +++ b/suites/upgrade/rados-double/6-upgrade-next/next.yaml @@ -0,0 +1,4 @@ +tasks: +- install.upgrade: + all: + branch: next diff --git a/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml b/suites/upgrade/rados-double/7-restart/mds-mon-osd.yaml new file mode 100644 index 0000000000000..d21800684d333 --- /dev/null +++ b/suites/upgrade/rados-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/rados-double/7-restart/mon-mds-osd.yaml b/suites/upgrade/rados-double/7-restart/mon-mds-osd.yaml new file mode 100644 index 0000000000000..78e14e9472a43 --- /dev/null +++ b/suites/upgrade/rados-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/rados-double/7-restart/osd-mds-mon.yaml b/suites/upgrade/rados-double/7-restart/osd-mds-mon.yaml new file mode 100644 index 0000000000000..dbcd013b3f0e5 --- /dev/null +++ b/suites/upgrade/rados-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/rados-double/8-next-workload/api.yaml b/suites/upgrade/rados-double/8-next-workload/api.yaml new file mode 100644 index 0000000000000..294713cf2e490 --- /dev/null +++ b/suites/upgrade/rados-double/8-next-workload/api.yaml @@ -0,0 +1,7 @@ +tasks: +- workunit: + branch: next + clients: + client.0: + - rados/test.sh + - cls diff --git a/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml b/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml new file mode 100644 index 0000000000000..c54039766c0b7 --- /dev/null +++ b/suites/upgrade/rados-double/8-next-workload/snaps-few-objects.yaml @@ -0,0 +1,12 @@ +tasks: +- rados: + clients: [client.0] + ops: 4000 + objects: 50 + op_weights: + read: 100 + write: 100 + delete: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 -- 2.39.5