Merge pull request ceph#62813 from smanjara/wip-fix-delete-object-tagging

rgw/multisite: sync object tagging deletion

Author: anrao19

src/rgw/driver/rados/rgw_sal_rados.cc

@@ -3519,6 +3519,11 @@ RadosObject::RadosReadOp::RadosReadOp(RadosObject *_source, RGWObjectCtx *_octx)
 int RadosObject::RadosReadOp::prepare(optional_yield y, const DoutPrefixProvider* dpp)
 {
   uint64_t obj_size;
+  ceph::real_time mtime;
+
+  if (!params.lastmod) {
+    params.lastmod = &mtime;
+  }
 
   parent_op.conds.mod_ptr = params.mod_ptr;
   parent_op.conds.unmod_ptr = params.unmod_ptr;
@@ -3539,6 +3544,7 @@ int RadosObject::RadosReadOp::prepare(optional_yield y, const DoutPrefixProvider
 
   source->set_instance(parent_op.state.obj.key.instance);
   source->set_obj_size(obj_size);
+  source->set_mtime(*params.lastmod);
   params.parts_count = parent_op.params.parts_count;
 
   return ret;

src/rgw/rgw_op.cc

@@ -342,6 +342,11 @@ static int get_obj_policy_from_attr(const DoutPrefixProvider *dpp,
 
   std::unique_ptr<rgw::sal::Object::ReadOp> rop = obj->get_read_op();
 
+  ret = rop->prepare(y, dpp);
+  if (ret < 0) {
+    return ret;
+  }
+
   ret = rop->get_attr(dpp, RGW_ATTR_ACL, bl, y);
   if (ret >= 0) {
     ret = decode_policy(dpp, cct, bl, policy);

src/test/rgw/rgw_multi/tests.py

@@ -5898,3 +5898,115 @@ def test_copy_obj_perm_check_between_zonegroups(zonegroup):
                           CopySource={'Bucket': source_bucket.name, 'Key': objname},
                           Key=objname)
         assert e.response['Error']['Code'] == 'AccessDenied'
+        
+
+@attr('object_tagging')
+def test_create_delete_obj_tagging():
+    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)
+
+    objname = 'dummy'
+
+    # upload a dummy object and wait for sync.
+    k = new_key(primary, bucket, objname)
+    k.set_contents_from_string('foo')
+    zonegroup_meta_checkpoint(zonegroup)
+
+    zonegroup_data_checkpoint(zonegroup_conns)
+    log.debug('created object=%s', objname)
+
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+
+    # put object tagging on primary zone
+    primary.s3_client.put_object_tagging(Bucket=bucket.name,
+                                Key= objname,
+                                Tagging={
+                                    'TagSet': [
+                                        {
+                                            'Key': 'key1',
+                                            'Value': 'value1'
+                                        },
+                                        ]})
+
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+
+    response = secondary.s3_client.get_object_tagging(Bucket=bucket.name,
+                                                      Key = objname)
+    assert(response['TagSet'][0]['Key'] == 'key1')
+    assert(response['TagSet'][0]['Value'] == 'value1')
+
+    primary.s3_client.delete_object_tagging(Bucket=bucket.name,
+                                Key= objname)
+
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+
+    response = secondary.s3_client.get_object_tagging(Bucket=bucket.name,
+                                                      Key = objname)
+
+    assert(response['TagSet'] == [])
+
+@attr('object_tagging')
+def test_create_delete_versioned_obj_tagging():
+
+    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)
+    zonegroup_meta_checkpoint(zonegroup)
+    
+    # upload an initial object
+    objname = 'dummy'
+    key = new_key(primary, bucket, objname)
+    key.set_contents_from_string('bar')
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+
+    # enable versioning
+    bucket.configure_versioning(True)
+    zonegroup_meta_checkpoint(zonegroup)
+
+    # upload object
+    k = new_key(primary, bucket, objname)
+    k.set_contents_from_string('foo')
+    log.debug('created new version id=%s', k.version_id)
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+    
+    # put object tagging on primary zone
+    primary.s3_client.put_object_tagging(Bucket=bucket.name,
+                                Key= objname,
+                                VersionId = k.version_id,
+                                Tagging={
+                                    'TagSet': [
+                                        {
+                                            'Key': 'key1',
+                                            'Value': 'value1'
+                                        },
+                                        ]})
+  
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+
+    response = secondary.s3_client.get_object_tagging(Bucket=bucket.name,
+                                                      Key = objname,
+                                                      VersionId = k.version_id)
+    assert(response['TagSet'][0]['Key'] == 'key1')
+    assert(response['TagSet'][0]['Value'] == 'value1')
+
+    primary.s3_client.delete_object_tagging(Bucket=bucket.name,
+                                Key= objname,
+                                VersionId = k.version_id)
+
+    zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name)
+ 
+    response = secondary.s3_client.get_object_tagging(Bucket=bucket.name,
+                                                      Key = objname,
+                                                      VersionId = k.version_id)
+
+    assert(response['TagSet'] == [])