From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 8 Nov 2019 09:50:23 +0000 (+0800)
Subject: rgw: fix a bug that bucket instance obj can't be removed after resharding completed.
X-Git-Tag: v13.2.9~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33306%2Fhead;p=ceph.git

rgw: fix a bug that bucket instance obj can't be removed after resharding completed.

Fixes: https://tracker.ceph.com/issues/42691

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 03039d9630e65088b525e9637dfc6f8f2c0a2702)

Conflicts:
	src/rgw/rgw_reshard.cc
- in master, *store has type "rgw::sal::RGWRadosStore", while in nautilus
  it has type "RGWRados", but this line appears to be merely incidental
  to the patch
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index c01e391bf85..1d3b9ff2a1e 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -337,7 +337,7 @@ int RGWBucketReshard::cancel()
 class BucketInfoReshardUpdate
 {
   RGWRados *store;
-  RGWBucketInfo bucket_info;
+  RGWBucketInfo& bucket_info;
   std::map<string, bufferlist> bucket_attrs;
 
   bool in_progress{false};