From: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Thu, 13 Apr 2017 09:14:48 +0000 (+0800)
Subject: rgw: fix the bug that part's index can't be removed after completing
X-Git-Tag: v12.1.0~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=decc01e2b1be9e4f809ff052149e1e6377c35047;p=ceph.git

rgw: fix the bug that part's index can't be removed after completing
multipart upload when the bucket versioning is enabled.

Fixes: http://tracker.ceph.com/issues/19604

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 953edd9f930a..0c7429158ba1 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2669,6 +2669,7 @@ int RGWPutObjProcessor_Multipart::do_complete(size_t accounted_size,
   complete_writing_data();
 
   RGWRados::Object op_target(store, s->bucket_info, obj_ctx, head_obj);
+  op_target.set_versioning_disabled(true);
   RGWRados::Object::Write head_obj_op(&op_target);
 
   head_obj_op.meta.set_mtime = set_mtime;