]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add tenant to shard_id in RGWDeleteLC::execute() 10460/head
authorweiqiaomiao <wei.qiaomiao@zte.com.cn>
Wed, 27 Jul 2016 00:58:33 +0000 (08:58 +0800)
committerWei <wei.qiaomiao@zte.com.cn>
Tue, 29 Aug 2017 11:48:40 +0000 (19:48 +0800)
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>
src/rgw/rgw_op.cc

index db00d2ea6276819e1faf015838927cda621a4aaa..6920cb871644214e867eb22e7f31f57556c3819b 100644 (file)
@@ -4847,7 +4847,7 @@ void RGWDeleteLC::execute()
             << " returned err=" << op_ret << dendl;
     return;
   }
-  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);