From f963cd8b2889752c4afe399c4da0df53e8295cf7 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Mon, 1 Apr 2024 12:27:54 -0500 Subject: [PATCH] qa/suites: add "mon down" log variations to ignorelist Fixes: https://tracker.ceph.com/issues/64864 Signed-off-by: Laura Flores (cherry picked from commit d475ac3e6ab86a4913e1d318989c617031978bc2) Conflicts: qa/suites/orch/cephadm/smoke/start.yaml qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml The log-only-match entry was backported to squid before the ignorelist changes, but in main it was introduced after the ignorelist changes. See https://github.com/ceph/ceph/commit/b4522dd332d40a54b9e0be58bd96aeaa345f8977. --- qa/suites/orch/cephadm/smoke/start.yaml | 3 +++ qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml | 3 +++ .../workunits/task/test_monitoring_stack_basic.yaml | 3 +++ .../orch/cephadm/workunits/task/test_rgw_multisite.yaml | 3 +++ .../workunits/task/test_set_mon_crush_locations.yaml | 3 +++ qa/suites/upgrade/reef-x/parallel/1-tasks.yaml | 7 +++++++ qa/tasks/thrashosds-health.yaml | 3 +++ 7 files changed, 25 insertions(+) diff --git a/qa/suites/orch/cephadm/smoke/start.yaml b/qa/suites/orch/cephadm/smoke/start.yaml index aa446161ae6eb..52bac2488379e 100644 --- a/qa/suites/orch/cephadm/smoke/start.yaml +++ b/qa/suites/orch/cephadm/smoke/start.yaml @@ -2,6 +2,9 @@ overrides: ceph: log-ignorelist: - MON_DOWN + - mons down + - mon down + - out of quorum log-only-match: - CEPHADM_ tasks: diff --git a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml index 24642bb519865..558cedbd74e27 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_host_drain.yaml @@ -2,6 +2,9 @@ overrides: ceph: log-ignorelist: - MON_DOWN + - mons down + - mon down + - out of quorum log-only-match: - CEPHADM_ roles: diff --git a/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml b/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml index 9968c65c5698b..081d6fb964120 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_monitoring_stack_basic.yaml @@ -2,6 +2,9 @@ overrides: ceph: log-ignorelist: - MON_DOWN + - mons down + - mon down + - out of quorum log-only-match: - CEPHADM_ roles: diff --git a/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml b/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml index 3c117b4255283..b785fbd3a0916 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_rgw_multisite.yaml @@ -2,6 +2,9 @@ overrides: ceph: log-ignorelist: - MON_DOWN + - mons down + - mon down + - out of quorum log-only-match: - CEPHADM_ roles: diff --git a/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml b/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml index b35385ac7a476..8fa7f255ad0bd 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_set_mon_crush_locations.yaml @@ -3,6 +3,9 @@ overrides: log-ignorelist: - MON_DOWN - POOL_APP_NOT_ENABLED + - mon down + - mons down + - out of quorum log-only-match: - CEPHADM_ roles: diff --git a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml index 7f7ad8c57d3df..299e3d1b9a0a0 100644 --- a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml @@ -1,3 +1,10 @@ +overrides: + ceph: + log-ignorelist: + - mons down + - mon down + - MON_DOWN + - out of quorum tasks: - install: branch: reef diff --git a/qa/tasks/thrashosds-health.yaml b/qa/tasks/thrashosds-health.yaml index 6654836b63598..f06fd68e9beea 100644 --- a/qa/tasks/thrashosds-health.yaml +++ b/qa/tasks/thrashosds-health.yaml @@ -25,3 +25,6 @@ overrides: - PG_DEGRADED - PG_AVAILABILITY - POOL_APP_NOT_ENABLED + - mons down + - mon down + - out of quorum -- 2.39.5