From f1f20b26cbbdf7fa1e87ce269b54d5a608a21b8b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 25 Mar 2021 13:36:56 -0400 Subject: [PATCH] qa/suites/upgrade/octopus-x: disable insecure global_id reclaim health warnings These will trigger on upgrade; suppress them so that our health gates will still work. Signed-off-by: Sage Weil (cherry picked from commit 3e80f61efeafc186ea8130984d64c05b2707d6ba) Conflicts: qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml [ commit 04a3d4c927e7 ("qa/suites/rados/cephadm/upgrade: deploy a legacy r.z-style rgw") not in octopus ] qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml [ no octopus-x upgrade suite in octopus ] qa/suites/upgrade/octopus-x/rgw-multisite/overrides.yaml [ ditto ] qa/suites/upgrade/octopus-x/stress-split/1-start.yaml [ ditto ] --- qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml | 2 ++ .../nautilus-x/stress-split/1-ceph-install/nautilus.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml index f13b2e07ce713..8f8c56a08434d 100644 --- a/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml +++ b/qa/suites/rados/cephadm/upgrade/3-start-upgrade.yaml @@ -2,4 +2,6 @@ tasks: - cephadm.shell: env: [sha1] mon.a: + - ceph config set mon mon_warn_on_insecure_global_id_reclaim false --force + - ceph config set mon mon_warn_on_insecure_global_id_reclaim_allowed false --force - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml index 62469c09008e8..f6d34bda0802d 100644 --- a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml @@ -14,6 +14,9 @@ tasks: bluestore_warn_on_legacy_statfs: false bluestore warn on no per pool omap: false mon pg warn min per osd: 0 + mon: + mon_warn_on_insecure_global_id_reclaim: false + mon_warn_on_insecure_global_id_reclaim_allowed: false log-ignorelist: - evicting unresponsive client - exec: -- 2.39.5