From: Tamil Muthamizhan <tmuthami@redhat.com>
Date: Thu, 17 Nov 2016 21:41:32 +0000 (-0800)
Subject: whitelist CRC mismatch
X-Git-Tag: v10.2.6~165^2^2~15^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca0bc00a07ec54b0a3967d8a33fcad8c8a64b989;p=ceph.git

whitelist CRC mismatch

whitelisted CRC mismatch and added upgrade for second
half of the cluster

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
---

diff --git a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
index fdc7843eef9..b5863921189 100644
--- a/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-x/parallel/0-cluster/start.yaml
@@ -19,6 +19,7 @@ overrides:
     - wrongly marked me down
     - soft lockup
     - detected stalls on CPUs
+    - failed to encode map
     conf:
       mon:
         mon warn on legacy crush tunables: false
diff --git a/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml b/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
index bf10becfe8e..6c97885c19b 100644
--- a/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
+++ b/suites/upgrade/hammer-x/stress-split/3-thrash/default.yaml
@@ -6,6 +6,7 @@ overrides:
     - log bound mismatch
     - soft lockup
     - detected stalls on CPUs
+    - failed to encode map e
 tasks:
 - thrashosds:
     timeout: 1200
diff --git a/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml b/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml
new file mode 100644
index 00000000000..4bc6f7ee01d
--- /dev/null
+++ b/suites/upgrade/hammer-x/stress-split/8-finish-upgrade/last-osds-and-monc.yaml
@@ -0,0 +1,20 @@
+tasks:
+- install.upgrade:
+    osd.3:
+- ceph.restart:
+      daemons: [osd.3,osd.4,osd.5]
+      wait-for-healthy: false
+      wait-for-osds-up: true
+- sleep:
+      duration: 10
+- ceph.restart:
+    daemons: [mon.c]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- print: "**** done ceph.restart mon.c 8-next-mon"
+- ceph.wait_for_mon_quorum: [a, b, c]
+- exec:
+    osd.0:
+      - sleep 300 # http://tracker.ceph.com/issues/17808
+      - ceph osd set require_jewel_osds
+- print: "**** done wait_for_mon_quorum 8-next-mon"
diff --git a/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
deleted file mode 100644
index 793beb89789..00000000000
--- a/suites/upgrade/hammer-x/stress-split/8-next-mon/monc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- ceph.restart:
-    daemons: [mon.c]
-    wait-for-healthy: false
-    wait-for-osds-up: true
-- print: "**** done ceph.restart mon.c 8-next-mon"
-- ceph.wait_for_mon_quorum: [a, b, c]
-- exec:
-    osd.0:
-      - sleep 300 # http://tracker.ceph.com/issues/17808
-      - ceph osd set require_jewel_osds
-- print: "**** done wait_for_mon_quorum 8-next-mon"
diff --git a/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml b/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
index 187488dbfdf..028155ff4d0 100644
--- a/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
+++ b/suites/upgrade/hammer-x/tiering/0-cluster/start.yaml
@@ -16,6 +16,7 @@ overrides:
     - wrongly marked me down
     - soft lockup
     - detected stalls on CPUs
+    - failed to encode map
     conf:
       mon:
         mon warn on legacy crush tunables: false