From: root <root@korea-fg-ceph-57-117.120.120.117>
Date: Mon, 14 Nov 2016 02:41:26 +0000 (+0800)
Subject: rgw:fix for deleting objects name beginning and ending with underscores of one bucket... 
X-Git-Tag: v10.2.6~109^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=514a31fdd9282bdb534a0ea907e89aa586a388c3;p=ceph.git

rgw:fix for deleting objects name beginning and ending with underscores of one bucket using POST method of AWS's js sdk.
Fixes: http://tracker.ceph.com/issues/17888

Signed-off-by: zhouruisong 236131368@qq.com
(cherry picked from commit 2dda81d1e7057353c64aecaeadeb48d956c77a87)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 2da2129dd4f..79e244a1f55 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4449,7 +4449,8 @@ void RGWDeleteMultiObj::execute()
   for (iter = multi_delete->objects.begin();
         iter != multi_delete->objects.end() && num_processed < max_to_delete;
         ++iter, num_processed++) {
-    rgw_obj obj(bucket, *iter);
+    rgw_obj obj(bucket, (*iter).name);
+    obj.set_instance(s->object.instance);
 
     obj_ctx->set_atomic(obj);