From: weiqiaomiao <wei.qiaomiao@zte.com.cn>
Date: Wed, 27 Jul 2016 00:58:33 +0000 (+0800)
Subject: rgw: add tenant to shard_id in RGWDeleteLC::execute()
X-Git-Tag: v12.2.6~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22551%2Fhead;p=ceph.git

rgw: add tenant to shard_id in RGWDeleteLC::execute()

in RGWDeleteLC::execute(), we should add bucket.tenant to shard_id,
otherwise, the lc entry can't delete after this op

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 3e7cffb17ed6a473ecbcf8475a72dd2416e077f4)

Conflicts:
	src/rgw/rgw_op.cc - luminous does not have 3e528f1ee837a09e1337283a2992e81a87f1bd98
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index d2a9c0b4e48..c8be8149f19 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5005,7 +5005,7 @@ void RGWDeleteLC::execute()
       }
     }
   op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs, &s->bucket_info.objv_tracker);
-  string shard_id = s->bucket.name + ':' +s->bucket.bucket_id;
+  string shard_id = s->bucket.tenant + ':' + s->bucket.name + ':' + s->bucket.bucket_id;
   pair<string, int> entry(shard_id, lc_uninitial);
   string oid; 
   get_lc_oid(s, oid);