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: v15.1.0~643^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03039d9630e65088b525e9637dfc6f8f2c0a2702;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>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 81656cba97f..0265d367b9b 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -375,7 +375,7 @@ int RGWBucketReshard::cancel()
 class BucketInfoReshardUpdate
 {
   rgw::sal::RGWRadosStore *store;
-  RGWBucketInfo bucket_info;
+  RGWBucketInfo& bucket_info;
   std::map<string, bufferlist> bucket_attrs;
 
   bool in_progress{false};