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 933aebb3ea61726012dcf38b1e455926d461576f..093115e7775f5947e279796a1e568e5028529cdf 100644 (file)
--- 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 9dd47f4f9929e5be0556b53ee2227a81bbbbf26d..c32e1daa0cc0be4e81da95be1c1025f87e6fb627 100644 (file)
--- 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 824fbe44a2e5273aafccd03c2c34ded34a710710..f48bd8b256d2536a4ef0475bb5c974acdcb8d982 100644 (file)
--- 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 864184827cb205bf6f1e82dd228df51b88dc8d07..73490ee68de290f2beda3f1b36629d22f996e1d8 100644 (file)
--- 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 30edfcf9e9c07b5301587b726f3b990d652d2190..2f1234205ccb565e7a3c1a605ec3b837cc67753a 100644 (file)
--- 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 d63e07d194cc43c88f64bae2b101dcee30d6af92..eadb2c6613d6e20ad0bf6df7abdcf010d3a6f37c 100644 (file)
--- 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 a7449e4d0326e1bcad983af8c252e538ef3e1056..f2b70eb3d22c029bdd04c6dc3b60e3fbd4fb861d 100644 (file)
--- 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 01975defac60e282c0773947d94da8aba698a4d4..9a34e752d5c82937ca0434742743707754b7e613 100644 (file)
--- 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 1a5535e8bc2676f96aea238820e4cbc85f4fe76a..f318d646492df9f7e75a7e75c1f1c706f1f0338b 100644 (file)
--- 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 3ab16d516c108c2e73969fadea80ada58ba72c39..a060897280b57f3c21e78c7e2b563df3647bcb61 100644 (file)
--- 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