From 4676b41ae2642102b5e0c0334c9f682948843301 Mon Sep 17 00:00:00 2001
From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 8 Nov 2019 17:50:23 +0800
Subject: [PATCH] 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
---
 src/rgw/rgw_reshard.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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