]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix a bug that bucket instance obj can't be removed after resharding completed. 32822/head
authorzhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Fri, 8 Nov 2019 09:50:23 +0000 (17:50 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 24 Jan 2020 14:23:04 +0000 (15:23 +0100)
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

index 7237e5073ce01415ddc9e6e33433d9d1687157d8..39bd5f06a7cc7a777ecc2bfcf726b863f1992ab1 100644 (file)
@@ -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};