rgw: cloud sync: store versioned epoch in target object

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_sync_module_aws.cc b/src/rgw/rgw_sync_module_aws.cc
index b5f503b9d526a5cd34198a18ac2f598a6fd5b52b..2f2c380533e1fca462a856ca635f716d7eae37a7 100644 (file)
--- a/src/rgw/rgw_sync_module_aws.cc
+++ b/src/rgw/rgw_sync_module_aws.cc
@@ -777,6 +777,7 @@ public:
 class RGWAWSStreamPutCRF : public RGWStreamWriteHTTPResourceCRF
 {
   RGWDataSyncEnv *sync_env;
+  rgw_sync_aws_src_obj_properties src_properties;
   std::shared_ptr<AWSSyncConfig_Profile> target;
   rgw_obj dest_obj;
   string etag;
@@ -785,9 +786,10 @@ public:
                                RGWCoroutinesEnv *_env,
                                RGWCoroutine *_caller,
                                RGWDataSyncEnv *_sync_env,
+                               const rgw_sync_aws_src_obj_properties&  _src_properties,
                                std::shared_ptr<AWSSyncConfig_Profile>& _target,
                                rgw_obj& _dest_obj) : RGWStreamWriteHTTPResourceCRF(_cct, _env, _caller, _sync_env->http_manager),
-                                                     sync_env(_sync_env), target(_target), dest_obj(_dest_obj) {
+                                                     sync_env(_sync_env), src_properties(_src_properties), target(_target), dest_obj(_dest_obj) {
   }
 
   int init() {
@@ -905,6 +907,10 @@ public:
       new_attrs[header_str] = s;
     }
 
+    char buf[32];
+    snprintf(buf, sizeof(buf), "%llu", (long long)src_properties.versioned_epoch);
+    new_attrs["x-amz-meta-rgwx-versioned-epoch"] = buf;
+
     r->set_send_length(rest_obj.content_len);
 
     RGWAccessControlPolicy policy;
@@ -964,8 +970,8 @@ public:
                                            src_properties));
 
       /* init output */
-      out_crf.reset(new RGWAWSStreamPutCRF(cct, get_env(), this, sync_env, target,
-                                           dest_obj));
+      out_crf.reset(new RGWAWSStreamPutCRF(cct, get_env(), this, sync_env,
+                                           src_properties, target, dest_obj));
 
       yield call(new RGWStreamSpliceCR(cct, sync_env->http_manager, in_crf, out_crf));
       if (retcode < 0) {
@@ -1027,8 +1033,8 @@ public:
       in_crf->set_range(part_info.ofs, part_info.size);
 
       /* init output */
-      out_crf.reset(new RGWAWSStreamPutCRF(cct, get_env(), this, sync_env, target,
-                                           dest_obj));
+      out_crf.reset(new RGWAWSStreamPutCRF(cct, get_env(), this, sync_env,
+                                           src_properties, target, dest_obj));
 
       out_crf->set_multipart(upload_id, part_info.part_num, part_info.size);
 
@@ -1483,6 +1489,8 @@ int decode_attr(map<string, bufferlist>& attrs, const char *attr_name, T *result
 class RGWAWSHandleRemoteObjCBCR: public RGWStatRemoteObjCBCR {
   AWSSyncInstanceEnv& instance;
 
+  uint64_t versioned_epoch{0};
+
   RGWRESTConn *source_conn{nullptr};
   std::shared_ptr<AWSSyncConfig_Profile> target;
   bufferlist res;
@@ -1509,8 +1517,9 @@ public:
   RGWAWSHandleRemoteObjCBCR(RGWDataSyncEnv *_sync_env,
                             RGWBucketInfo& _bucket_info,
                             rgw_obj_key& _key,
-                            AWSSyncInstanceEnv& _instance) : RGWStatRemoteObjCBCR(_sync_env, _bucket_info, _key),
-                                                         instance(_instance)
+                            AWSSyncInstanceEnv& _instance,
+                            uint64_t _versioned_epoch) : RGWStatRemoteObjCBCR(_sync_env, _bucket_info, _key),
+                                                         instance(_instance), versioned_epoch(_versioned_epoch)
   {}
 
   ~RGWAWSHandleRemoteObjCBCR(){
@@ -1596,6 +1605,7 @@ public:
         src_properties.etag = etag;
         src_properties.zone_short_id = src_zone_short_id;
         src_properties.pg_ver = src_pg_ver;
+        src_properties.versioned_epoch = versioned_epoch;
 
         if (size < instance.conf.s3.multipart_sync_threshold) {
           call(new RGWAWSStreamObjToCloudPlainCR(sync_env, source_conn, src_obj,
@@ -1620,17 +1630,18 @@ public:
 
 class RGWAWSHandleRemoteObjCR : public RGWCallStatRemoteObjCR {
   AWSSyncInstanceEnv& instance;
+  uint64_t versioned_epoch;
 public:
   RGWAWSHandleRemoteObjCR(RGWDataSyncEnv *_sync_env,
                               RGWBucketInfo& _bucket_info, rgw_obj_key& _key,
-                              AWSSyncInstanceEnv& _instance) : RGWCallStatRemoteObjCR(_sync_env, _bucket_info, _key),
-                                                          instance(_instance) {
+                              AWSSyncInstanceEnv& _instance, uint64_t _versioned_epoch) : RGWCallStatRemoteObjCR(_sync_env, _bucket_info, _key),
+                                                          instance(_instance), versioned_epoch(_versioned_epoch) {
   }
 
   ~RGWAWSHandleRemoteObjCR() {}
 
   RGWStatRemoteObjCBCR *allocate_callback() override {
-    return new RGWAWSHandleRemoteObjCBCR(sync_env, bucket_info, key, instance);
+    return new RGWAWSHandleRemoteObjCBCR(sync_env, bucket_info, key, instance, versioned_epoch);
   }
 };
 
@@ -1690,7 +1701,7 @@ public:
   RGWCoroutine *sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, uint64_t versioned_epoch,
                             rgw_zone_set *zones_trace) override {
     ldout(sync_env->cct, 0) << instance.id << ": sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch << dendl;
-    return new RGWAWSHandleRemoteObjCR(sync_env, bucket_info, key, instance);
+    return new RGWAWSHandleRemoteObjCR(sync_env, bucket_info, key, instance, versioned_epoch);
   }
   RGWCoroutine *remove_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, real_time& mtime, bool versioned, uint64_t versioned_epoch,
                               rgw_zone_set *zones_trace) override {

diff --git a/src/rgw/rgw_sync_module_aws.h b/src/rgw/rgw_sync_module_aws.h
index 350c14e32b104c6c5e9e08c97742bb89f724e66e..dca647572540f4055e188bbb1aeaec4aba32d87e 100644 (file)
--- a/src/rgw/rgw_sync_module_aws.h
+++ b/src/rgw/rgw_sync_module_aws.h
@@ -34,6 +34,7 @@ struct rgw_sync_aws_src_obj_properties {
   string etag;
   uint32_t zone_short_id{0};
   uint64_t pg_ver{0};
+  uint64_t versioned_epoch{0};
 
   void encode(bufferlist& bl) const {
     ENCODE_START(1, 1, bl);
@@ -41,6 +42,7 @@ struct rgw_sync_aws_src_obj_properties {
     encode(etag, bl);
     encode(zone_short_id, bl);
     encode(pg_ver, bl);
+    encode(versioned_epoch, bl);
     ENCODE_FINISH(bl);
   }
 
@@ -50,6 +52,7 @@ struct rgw_sync_aws_src_obj_properties {
     decode(etag, bl);
     decode(zone_short_id, bl);
     decode(pg_ver, bl);
+    decode(versioned_epoch, bl);
     DECODE_FINISH(bl);
   }
 };