From af98929a74b598803e9a34eedb5aad161cf7cbb4 Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 1 May 2024 13:35:27 -0400 Subject: [PATCH] qa/cephadm: ignore CEPHADM_STRAY_DAEMON in upgrade tests There is some other ongoing work to make it so daemons created/destroyed in the last minute are not marked stray as there can be a delay between when cephadm considers the daemon as being removed and when the core mgr reports the same. Unfortunately, that change only fixes it for releases in which the patch will be present, so the upgrade test is still susceptible to having these warnings pop up before the upgrade occurs. Signed-off-by: Adam King (cherry picked from commit c4a875f6810923e0efb5ed752b5df3ec1b2f4633) --- qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml | 2 ++ qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml index ac93a456cb6b3..5da510cb56349 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml @@ -1,5 +1,7 @@ overrides: ceph: + log-ignorelist: + - CEPHADM_STRAY_DAEMON log-only-match: - CEPHADM_ tasks: diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml index f1fd9f039bb8f..c78d3b4c2935b 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml +++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml @@ -1,5 +1,7 @@ overrides: ceph: + log-ignorelist: + - CEPHADM_STRAY_DAEMON log-only-match: - CEPHADM_ tasks: