From 435777dbffc77c93d06476caf83be141359a5778 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Aug 2017 16:40:43 -0400
Subject: [PATCH] qa/suites/upgrade/jewel-x/parallel: thrash layout

We can't kill and restart osds because that will interfere with
the upgrade process.  We can, however, thrash the layout by
tweaking osd weights and so on.  This will exercise osd recovery
paths during the upgrade that aren't normally exercised (outside
of stress-split..which doesn't upgrade individual osds while they
are non-clean).

Signed-off-by: Sage Weil <sage@redhat.com>
---
 .../parallel/1-jewel-install/jewel.yaml       |  7 -------
 .../parallel/1.5-thrash-layout/no.yaml        |  0
 .../parallel/1.5-thrash-layout/yes.yaml       | 19 +++++++++++++++++++
 .../parallel/1.7-workload-and-upgrade.yaml    |  8 ++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/no.yaml
 create mode 100644 qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml
 create mode 100644 qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml

diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
index a7ff9f485d7..12f8e61ec04 100644
--- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
@@ -31,10 +31,3 @@ tasks:
     mon.a:
     mon.b:
 - print: "**** done install.upgrade mon.a and mon.b"
-- parallel:
-    - workload
-    - upgrade-sequence
-- print: "**** done parallel"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"
diff --git a/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/no.yaml b/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/no.yaml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml b/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml
new file mode 100644
index 00000000000..4422187e7fb
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/1.5-thrash-layout/yes.yaml
@@ -0,0 +1,19 @@
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_down: 0
+    disable_objectstore_tool_tests: true
+    chance_thrash_pg_upmap: 0
+    chance_thrash_pg_upmap_items: 0
+    chance_thrash_cluster_full: 0
+    dump_ops_enable: false
+    sighup_delay: 0
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - \(OSDMAP_FLAGS\)
+      - \(SMALLER_PGP_NUM\)
+      - \(OBJECT_
+      - \(REQUEST_SLOW\)
+      - \(TOO_FEW_PGS\)
diff --git a/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml b/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml
new file mode 100644
index 00000000000..2f00563a5a1
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/parallel/1.7-workload-and-upgrade.yaml
@@ -0,0 +1,8 @@
+tasks:
+- parallel:
+    - workload
+    - upgrade-sequence
+- print: "**** done parallel"
+- install.upgrade:
+    client.0:
+- print: "**** done install.upgrade on client.0"