From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 10 Dec 2018 16:15:53 +0000 (+0100)
Subject: rgw: swift: generate obj instance name while copying versioned objects
X-Git-Tag: v14.1.0~503^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7515bae393075edff3a4b351bcbcf7376c3fb617;p=ceph.git

rgw: swift: generate obj instance name while copying versioned objects

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 8c8a08588b09..6e2158772bff 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3340,6 +3340,11 @@ int RGWRados::swift_versioning_copy(RGWObjectCtx& obj_ctx,
   }
 
   rgw_obj dest_obj(dest_bucket_info.bucket, buf);
+
+  if (dest_bucket_info.versioning_enabled()){
+    gen_rand_obj_instance_name(&dest_obj);
+  }
+
   obj_ctx.set_atomic(dest_obj);
 
   string no_zone;
@@ -3427,6 +3432,11 @@ int RGWRados::swift_versioning_restore(RGWSysObjectCtx& sysobj_ctx,
     std::map<std::string, ceph::bufferlist> no_attrs;
 
     rgw_obj archive_obj(archive_binfo.bucket, entry.key);
+
+    if (bucket_info.versioning_enabled()){
+      gen_rand_obj_instance_name(&obj);
+    }
+
     obj_ctx.set_atomic(archive_obj);
     obj_ctx.set_atomic(obj);