From a4eb581419b0941253d46dc2745caad78f82afad Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 25 Sep 2019 08:20:43 -0500 Subject: [PATCH] qa/suites/rados/thrash-old-clients: tolerate MON_DOWN The first thing this test does is upgrade all mons. Signed-off-by: Sage Weil --- qa/suites/rados/thrash-old-clients/1-install/hammer.yaml | 2 ++ .../rados/thrash-old-clients/1-install/jewel-v1only.yaml | 2 ++ qa/suites/rados/thrash-old-clients/1-install/jewel.yaml | 2 ++ .../rados/thrash-old-clients/1-install/luminous-v1only.yaml | 2 ++ qa/suites/rados/thrash-old-clients/1-install/luminous.yaml | 2 ++ .../rados/thrash-old-clients/1-install/mimic-v1only.yaml | 2 ++ qa/suites/rados/thrash-old-clients/1-install/mimic.yaml | 2 ++ .../rados/thrash-old-clients/1-install/nautilus-v1only.yaml | 2 ++ .../rados/thrash-old-clients/1-install/nautilus-v2only.yaml | 2 ++ qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml | 4 ++++ 10 files changed, 22 insertions(+) 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 933aebb3ea6..093115e7775 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 9dd47f4f992..c32e1daa0cc 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 824fbe44a2e..f48bd8b256d 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 864184827cb..73490ee68de 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 30edfcf9e9c..2f1234205cc 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 d63e07d194c..eadb2c6613d 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 a7449e4d032..f2b70eb3d22 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 01975defac6..9a34e752d5c 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 1a5535e8bc2..f318d646492 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 3ab16d516c1..a060897280b 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 -- 2.39.5