]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/multisite: object should generate version id on archive zone, even when versioning
authorShilpa Jagannath <smanjara@redhat.com>
Thu, 3 Nov 2022 02:23:52 +0000 (22:23 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Fri, 13 Jan 2023 13:53:21 +0000 (08:53 -0500)
is disabled on primary

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
src/rgw/driver/rados/rgw_data_sync.cc

index 758327f95adfa9fc017f915577117c05ebbf7943..9ecd09363064de75104d251f7288a8c85465f028 100644 (file)
@@ -2987,9 +2987,11 @@ RGWCoroutine *RGWArchiveDataSyncModule::sync_object(const DoutPrefixProvider *dp
   if (versioned_epoch.value_or(0) == 0) { /* force version if not set */
     versioned_epoch = 0;
     dest_key = key;
-    if (key.instance.empty()) {
-      sync_env->driver->getRados()->gen_rand_obj_instance_name(&(*dest_key));
-    }
+  }
+
+  if (key.instance.empty()) {
+    dest_key = key;
+    sync_env->driver->getRados()->gen_rand_obj_instance_name(&(*dest_key));
   }
 
   return new RGWObjFetchCR(sc, sync_pipe, key, dest_key, versioned_epoch, zones_trace);