Merge pull request #58385 from smanjara/wip-squid-pr-56874

[squid] qa/multisite: stabilize multisite testing

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

diff --cc src/test/rgw/rgw_multi/tests.py
index 78c8d722b2ff7210848754fbeba01e177d5f1369,a57d6948acc164fdfa029d40abf61b2b1e890cb0..df9c70a47810a16ca67cb28b5248e31e41fabbe1
--- 1/src/test/rgw/rgw_multi/tests.py
--- 2/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@@ -1921,37 -1928,8 +1928,38 @@@ def test_role_delete_sync()
                        zone.iam_conn.get_role, RoleName=role_name)
          log.info(f'success, zone: {zone.name} does not have role: {role_name}')
  
 +def test_object_acl():
 +    zonegroup = realm.master_zonegroup()
 +    zonegroup_conns = ZonegroupConns(zonegroup)
 +    primary = zonegroup_conns.rw_zones[0]
 +    secondary = zonegroup_conns.rw_zones[1]
 +
 +    bucket = primary.create_bucket(gen_bucket_name())
 +    log.debug('created bucket=%s', bucket.name)
 +
 +    # upload a dummy object and wait for sync.
 +    k = new_key(primary, bucket, 'dummy')
 +    k.set_contents_from_string('foo')
 +    zonegroup_meta_checkpoint(zonegroup)
 +    zonegroup_data_checkpoint(zonegroup_conns)
 +
 +    #check object on secondary before setacl
 +    bucket2 = get_bucket(secondary, bucket.name)
 +    before_set_acl = bucket2.get_acl(k)
 +    assert(len(before_set_acl.acl.grants) == 1)
 +
 +    #set object acl on primary and wait for sync.
 +    bucket.set_canned_acl('public-read', key_name=k)
 +    log.debug('set acl=%s', bucket.name)
 +    zonegroup_data_checkpoint(zonegroup_conns)
 +    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
 +
 +    #check object secondary after setacl
 +    bucket2 = get_bucket(secondary, bucket.name)
 +    after_set_acl = bucket2.get_acl(k)
 +    assert(len(after_set_acl.acl.grants) == 2) # read grant added on AllUsers
  
+ @attr('fails_with_rgw')
  @attr('data_sync_init')
  def test_bucket_full_sync_after_data_sync_init():
      zonegroup = realm.master_zonegroup()