From: Shilpa Jagannath Date: Wed, 22 Jul 2026 18:13:50 +0000 (+0000) Subject: qa/multisite: fixes multisite test: test_zonegroup_rename X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90098a7027c3557860c86f2ae7389a22cb6ae075;p=ceph.git qa/multisite: fixes multisite test: test_zonegroup_rename period commit only triggers async push (RGWPeriodPusher) from the a zone's gateway to the other zones. it doesn't block until they've applied it. a reconfigure delay alone might not be sufficient. add checkpoint retries to allow for lag. Signed-off-by: Shilpa Jagannath --- diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index a9caf0f52296..02c088e55461 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -1617,11 +1617,19 @@ def test_zonegroup_rename(): new_zg = ZoneGroup(new_name, master_zg.period) old_zg = ZoneGroup(old_name, master_zg.period) for zone in master_zg.zones: - _, r = new_zg.get(zone.cluster, check_retcode=False) + for _ in range(config.checkpoint_retries): + _, r = new_zg.get(zone.cluster, check_retcode=False) + if r == 0: + break + time.sleep(config.checkpoint_delay) assert r == 0, \ "new zonegroup name '%s' not found on zone %s" % (new_name, zone.name) - _, r = old_zg.get(zone.cluster, check_retcode=False) + for _ in range(config.checkpoint_retries): + _, r = old_zg.get(zone.cluster, check_retcode=False) + if r == errno.ENOENT: + break + time.sleep(config.checkpoint_delay) assert r == errno.ENOENT, \ "old zonegroup name '%s' still present on zone %s (r=%d)" % (old_name, zone.name, r)