]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove unused block of code 48663/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Tue, 15 Nov 2022 02:19:19 +0000 (21:19 -0500)
committerJ. Eric Ivancich <ivancich@redhat.com>
Tue, 15 Nov 2022 05:56:55 +0000 (00:56 -0500)
The removed block of code ultimately calls
RGWRados::bucket_set_reshard as the code block immediately below does,
although this block of code does not restore it to its correct "not
resharding" state.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
src/rgw/rgw_reshard.cc

index 284b69c826da338a8537c904a2883ee67729eb20..7ab63ed503d1dff0ed3ec35f5e9c98c9f9ea3cef 100644 (file)
@@ -289,13 +289,6 @@ int RGWBucketReshard::clear_resharding(const DoutPrefixProvider *dpp,
                                       const RGWBucketInfo& bucket_info)
 {
   int ret;
-  ret = clear_index_shard_reshard_status(dpp, store, bucket_info);
-  if (ret < 0) {
-    ldpp_dout(dpp, 0) << "RGWBucketReshard::" << __func__ <<
-      " ERROR: error clearing reshard status from index shard " <<
-      cpp_strerror(-ret) << dendl;
-    return ret;
-  }
 
   // default constructed = NOT_RESHARDING
   cls_rgw_bucket_instance_entry instance_entry;