From 2917fd4af2d5409e9f9fad11c344ea8f851842ac Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Sun, 23 Jun 2013 21:53:08 -0700
Subject: [PATCH] upgrade/rados: refactor, expand matrix, start with cuttlefish

---
 suites/upgrade/rados/0-cluster/start.yaml     | 10 +++++++++
 .../1-cuttlefish-install/cuttlefish.yaml      |  4 ++++
 .../rados/2-cuttlefish-workload/api.yaml      |  7 ++++++
 .../2-cuttlefish-workload/load-gen-mix.yaml   |  6 +++++
 suites/upgrade/rados/3-upgrade/next.yaml      |  4 ++++
 .../{b => 4-restart}/upgrade_mds_mon_osd.yaml |  0
 .../{b => 4-restart}/upgrade_mds_osd_mon.yaml |  0
 .../{b => 4-restart}/upgrade_mon_mds_osd.yaml |  0
 .../{b => 4-restart}/upgrade_mon_osd_mds.yaml |  0
 .../{b => 4-restart}/upgrade_osd_mds_mon.yaml |  0
 .../{b => 4-restart}/upgrade_osd_mon_mds.yaml |  0
 suites/upgrade/rados/5-next-workload/api.yaml |  7 ++++++
 .../5-next-workload/snaps-few-objects.yaml    | 12 ++++++++++
 suites/upgrade/rados/a/start.yaml             | 22 -------------------
 suites/upgrade/rados/c/tail.yaml              |  6 -----
 15 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 suites/upgrade/rados/0-cluster/start.yaml
 create mode 100644 suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
 create mode 100644 suites/upgrade/rados/2-cuttlefish-workload/api.yaml
 create mode 100644 suites/upgrade/rados/2-cuttlefish-workload/load-gen-mix.yaml
 create mode 100644 suites/upgrade/rados/3-upgrade/next.yaml
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_mds_mon_osd.yaml (100%)
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_mds_osd_mon.yaml (100%)
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_mon_mds_osd.yaml (100%)
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_mon_osd_mds.yaml (100%)
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_osd_mds_mon.yaml (100%)
 rename suites/upgrade/rados/{b => 4-restart}/upgrade_osd_mon_mds.yaml (100%)
 create mode 100644 suites/upgrade/rados/5-next-workload/api.yaml
 create mode 100644 suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml
 delete mode 100644 suites/upgrade/rados/a/start.yaml
 delete mode 100644 suites/upgrade/rados/c/tail.yaml

diff --git a/suites/upgrade/rados/0-cluster/start.yaml b/suites/upgrade/rados/0-cluster/start.yaml
new file mode 100644
index 0000000000000..01747e4205612
--- /dev/null
+++ b/suites/upgrade/rados/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/1-cuttlefish-install/cuttlefish.yaml b/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
new file mode 100644
index 0000000000000..b259af97269f4
--- /dev/null
+++ b/suites/upgrade/rados/1-cuttlefish-install/cuttlefish.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install:
+    branch: cuttlefish
+- ceph:
diff --git a/suites/upgrade/rados/2-cuttlefish-workload/api.yaml b/suites/upgrade/rados/2-cuttlefish-workload/api.yaml
new file mode 100644
index 0000000000000..66526582579d9
--- /dev/null
+++ b/suites/upgrade/rados/2-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/2-cuttlefish-workload/load-gen-mix.yaml b/suites/upgrade/rados/2-cuttlefish-workload/load-gen-mix.yaml
new file mode 100644
index 0000000000000..7ec655c8ccfcb
--- /dev/null
+++ b/suites/upgrade/rados/2-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/3-upgrade/next.yaml b/suites/upgrade/rados/3-upgrade/next.yaml
new file mode 100644
index 0000000000000..3e8e04cadbf05
--- /dev/null
+++ b/suites/upgrade/rados/3-upgrade/next.yaml
@@ -0,0 +1,4 @@
+tasks:
+- install.upgrade:
+     all:
+        branch: next
diff --git a/suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_mds_mon_osd.yaml
rename to suites/upgrade/rados/4-restart/upgrade_mds_mon_osd.yaml
diff --git a/suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_mds_osd_mon.yaml
rename to suites/upgrade/rados/4-restart/upgrade_mds_osd_mon.yaml
diff --git a/suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_mon_mds_osd.yaml
rename to suites/upgrade/rados/4-restart/upgrade_mon_mds_osd.yaml
diff --git a/suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_mon_osd_mds.yaml
rename to suites/upgrade/rados/4-restart/upgrade_mon_osd_mds.yaml
diff --git a/suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_osd_mds_mon.yaml
rename to suites/upgrade/rados/4-restart/upgrade_osd_mds_mon.yaml
diff --git a/suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml b/suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
similarity index 100%
rename from suites/upgrade/rados/b/upgrade_osd_mon_mds.yaml
rename to suites/upgrade/rados/4-restart/upgrade_osd_mon_mds.yaml
diff --git a/suites/upgrade/rados/5-next-workload/api.yaml b/suites/upgrade/rados/5-next-workload/api.yaml
new file mode 100644
index 0000000000000..294713cf2e490
--- /dev/null
+++ b/suites/upgrade/rados/5-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/5-next-workload/snaps-few-objects.yaml b/suites/upgrade/rados/5-next-workload/snaps-few-objects.yaml
new file mode 100644
index 0000000000000..c54039766c0b7
--- /dev/null
+++ b/suites/upgrade/rados/5-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
diff --git a/suites/upgrade/rados/a/start.yaml b/suites/upgrade/rados/a/start.yaml
deleted file mode 100644
index b556eb06b30ad..0000000000000
--- a/suites/upgrade/rados/a/start.yaml
+++ /dev/null
@@ -1,22 +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:
-           - rados/load-gen-mix.sh
-- install.upgrade:
-     all:
-        branch: next
diff --git a/suites/upgrade/rados/c/tail.yaml b/suites/upgrade/rados/c/tail.yaml
deleted file mode 100644
index 085348dbd2179..0000000000000
--- a/suites/upgrade/rados/c/tail.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-     branch: next
-     clients:
-        client.0:
-           - rados/test.sh
-- 
2.39.5