From: Patrick Donnelly <pdonnell@ibm.com>
Date: Wed, 11 Feb 2026 19:05:07 +0000 (-0500)
Subject: Merge PR #67011 into main
X-Git-Tag: testing/wip-vshankar-testing-20260212.053105~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21b875e8f9d85f5e9c170ad4772fe0e86cd516a0;p=ceph-ci.git

Merge PR #67011 into main

* refs/pull/67011/head:
	qa/multisite: use boto3's ClientError in place of assert_raises from tools.py.
	qa/multisite: test fixes
	qa/multisite: boto3 in tests.py
	qa/multisite: zone files use boto3 resource api
	qa/multisite: switch to boto3 in multisite test libraries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

21b875e8f9d85f5e9c170ad4772fe0e86cd516a0
diff --cc src/test/rgw/rgw_multi/tests.py
index c732dbb92fe,29e142ddc5e..a0e22e6995f
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@@ -6170,93 -6149,7 +6176,93 @@@ def test_object_lock_sync()
      zone_data_checkpoint(secondary.zone, primary.zone)
  
      response = secondary.s3_client.get_object_lock_configuration(Bucket=bucket.name)
-     assert(response['ObjectLockConfiguration'] == lock_config)
+     assert response['ObjectLockConfiguration'] == lock_config
  
  
 -    
 +def test_period_update_commit():
 +    wkld_concurrency = 25
 +    num_objects_to_upload = 2500
 +    number_of_period_updates = 5
 +    test_passed = False
 +
 +    zonegroup = realm.master_zonegroup()
 +    zonegroup_conns = ZonegroupConns(zonegroup)
 +    primary_zone_client_conn = zonegroup_conns.rw_zones[0]
 +    secondary_zone_cluster_conn = zonegroup.zones[1]
 +
 +    bucket = primary_zone_client_conn.create_bucket(gen_bucket_name())
 +    log.info(f"created bucket={bucket.name}")
 +
 +    def run_client_wkld(stop_event: threading.Event, key_range):
 +        log.info(f"upload objects within range {key_range} to bucket={bucket.name}")
 +        num_uploads = 0
 +        while not stop_event.is_set():
 +            start, end = key_range
 +            for i in range(start, end + 1):
 +                try:
 +                    primary_zone_client_conn.s3_client.put_object(
 +                        Bucket=bucket.name, Key=f"obj-{i:04d}", Body="..."
 +                    )
 +                    num_uploads += 1
 +                except Exception as e:
 +                    log.debug(f"failed to upload object to bucket={bucket.name}: {e}")
 +        log.info(
 +            f"uploaded {num_uploads} times for the range {key_range} to bucket={bucket.name}"
 +        )
 +
 +    try:
 +        log.info("verify cluster is healthy before moving on")
 +        try:
 +            zonegroup_data_checkpoint(zonegroup_conns)
 +        except:
 +            log.info("restart gateways for a clean start")
 +            for z in zonegroup_conns.rw_zones:
 +                z.zone.start()
 +
 +        log.info("start client write-only workload to generate replication traffic")
 +        client_write_only_wkld_thread_stop = threading.Event()
 +        step = num_objects_to_upload // wkld_concurrency
 +        key_ranges = [(i * step, (i + 1) * step - 1) for i in range(wkld_concurrency)]
 +        client_write_only_wkld_threads = []
 +        for key_range in key_ranges:
 +            thread = threading.Thread(
 +                target=run_client_wkld,
 +                args=(client_write_only_wkld_thread_stop, key_range),
 +                daemon=False,
 +            )
 +            thread.start()
 +            client_write_only_wkld_threads.append(thread)
 +
 +        log.info("run period-update-commits and verify rgw instances reload properly")
 +        for _ in range(number_of_period_updates):
 +            log.info("issue period update commit")
 +            zonegroup.period.update(secondary_zone_cluster_conn, commit=True)
 +            log.info("verify data sync is making progress")
 +            if not data_sync_making_progress(secondary_zone_cluster_conn):
 +                break  # the issue of realm reload freezing reproduced
 +        client_write_only_wkld_thread_stop.set()  # stop client wkld
 +        zonegroup_data_checkpoint(zonegroup_conns)
 +        test_passed = True
 +    except Exception as e:
 +        log.error(f"test_period_update_commit failed: {e}")
 +        raise
 +    finally:
 +        client_write_only_wkld_thread_stop.set()
 +        for t in client_write_only_wkld_threads:
 +            t.join()
 +
 +        # without a fix, an rgw instance may crash or freeze
 +        # so restart all instances before further cleaning up
 +        if not test_passed:
 +            for z in zonegroup_conns.rw_zones:
 +                z.zone.start()
 +
 +        log.info(f"delete {num_objects_to_upload} objects from bucket={bucket.name}")
 +        for i in range(num_objects_to_upload):
 +            primary_zone_client_conn.s3_client.delete_object(
 +                Bucket=bucket.name,
 +                Key=f"obj-{i:04d}",
 +            )
 +        log.info(f"delete bucket={bucket.name}")
 +        primary_zone_client_conn.s3_client.delete_bucket(Bucket=bucket.name)
 +