From: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 17 Mar 2017 08:26:56 +0000 (+0800)
Subject: rgw: version id doesn't work in fetch_remote_obj
X-Git-Tag: v11.2.1~73^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ad2b140e01462d3dfe58fd03879f3868e561f165;p=ceph.git

rgw: version id doesn't work in fetch_remote_obj

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 8b43c9781206c22d9aedb4beb8d669bf1e23169f)

Conflicts:
	src/rgw/rgw_rados.cc: trivial: dest_obj.key.instance in master
	  versus dest_obj.get_instance() in Jewel
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 47f3790b3313f..9e329fc73a5d0 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -7061,9 +7061,8 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx,
   RGWPutObjProcessor_Atomic processor(obj_ctx,
                                       dest_bucket_info, dest_obj.bucket, dest_obj.get_orig_obj(),
                                       cct->_conf->rgw_obj_stripe_size, tag, dest_bucket_info.versioning_enabled());
-  const string& instance = dest_obj.get_instance();
-  if (instance != "null") {
-    processor.set_version_id(dest_obj.get_instance());
+  if (version_id) {
+    processor.set_version_id(*version_id);
   }
   processor.set_olh_epoch(olh_epoch);
   int ret = processor.prepare(this, NULL);