From: J. Eric Ivancich <ivancich@redhat.com>
Date: Tue, 15 Nov 2022 02:19:19 +0000 (-0500)
Subject: rgw: remove unused block of code
X-Git-Tag: v16.2.11~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c77802a80c0e75c6c26e69cca7ac77bfcd6277da;p=ceph.git

rgw: remove unused block of code

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>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 284b69c826da..7ab63ed503d1 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -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;