From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 22 Dec 2015 00:17:56 +0000 (-0800)
Subject: rgw: clear 'null' object instance when fetching remote obj
X-Git-Tag: v10.1.0~354^2~108
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb3dd942b32bb7c4b14932c9c27905a4cc32d80a;p=ceph.git

rgw: clear 'null' object instance when fetching remote obj

otherwise the objclass code will handle it as a versioned object

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index b8d299394be..94fe5653eff 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -6108,7 +6108,10 @@ 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());
-  processor.set_version_id(dest_obj.get_instance());
+  const string& instance = dest_obj.get_instance();
+  if (instance != "null") {
+    processor.set_version_id(dest_obj.get_instance());
+  }
   processor.set_olh_epoch(olh_epoch);
   int ret = processor.prepare(this, NULL);
   if (ret < 0) {