From: Shilpa Jagannath <smanjara@redhat.com>
Date: Thu, 3 Nov 2022 02:23:52 +0000 (-0400)
Subject: rgw/multisite: object should generate version id on archive zone, even when versioning
X-Git-Tag: v18.1.0~499^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bcea963d9710779c372e5f2ea9410e5a37c8380d;p=ceph.git

rgw/multisite: object should generate version id on archive zone, even when versioning
is disabled on primary

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
index 758327f95adfa..9ecd09363064d 100644
--- a/src/rgw/driver/rados/rgw_data_sync.cc
+++ b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -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);