rgw:fix for deleting objects name beginning and ending with underscores of one bucket...

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 2da2129dd4ffee0c88adc33bd4ad18b9a3fb41e0..79e244a1f558a7dbd92843b39b9a10d08c23cc99 100644 (file)
--- 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);