From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Sep 2019 13:20:43 +0000 (-0500)
Subject: qa/suites/rados/thrash-old-clients: tolerate MON_DOWN
X-Git-Tag: v15.1.0~1392^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4eb581419b0941253d46dc2745caad78f82afad;p=ceph.git

qa/suites/rados/thrash-old-clients: tolerate MON_DOWN

The first thing this test does is upgrade all mons.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
index 933aebb3ea61..093115e7775f 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml
@@ -3,6 +3,8 @@ overrides:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
     crush_tunables: hammer
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms bind msgr2: false
diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
index 9dd47f4f9929..c32e1daa0cc0 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index 824fbe44a2e5..f48bd8b256d2 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         mon warn on msgr2 not enabled: false
diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
index 864184827cb2..73490ee68de2 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_msgr2: false
     mon_bind_addrvec: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
index 30edfcf9e9c0..2f1234205ccb 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         mon warn on msgr2 not enabled: false
diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
index d63e07d194cc..eadb2c6613d6 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
index a7449e4d0326..f2b70eb3d22c 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_addrvec: false
     mon_bind_msgr2: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
index 01975defac60..9a34e752d5c8 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     mon_bind_msgr2: false
     mon_bind_addrvec: false
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
index 1a5535e8bc26..f318d646492d 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-whitelist:
+      - \(MON_DOWN\)
     conf:
       global:
         ms type: async
diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
index 3ab16d516c10..a060897280b5 100644
--- a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml
@@ -1,3 +1,7 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - \(MON_DOWN\)
 tasks:
 - install:
     branch: nautilus