From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 1 Feb 2021 17:02:44 +0000 (-0500)
Subject: radosgw-admin: try reshard even if bucket is resharding
X-Git-Tag: v17.2.7~347^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51835%2Fhead;p=ceph.git

radosgw-admin: try reshard even if bucket is resharding

allow reshard in case a previous reshard failed. if the reshard is
actually still in progress, we'll fail to get the reshard lock

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 122da8f14a1dae247a5f2f62a3a6e219a9c9de8f)

Conflicts:
	src/rgw/rgw_admin.cc  no rgw::current_num_shards()
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index fd8188e2ddab..9fd01ecc6138 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2934,13 +2934,6 @@ int check_reshard_bucket_params(rgw::sal::RadosStore* store,
     return ret;
   }
 
-  if ((*bucket)->get_info().reshard_status != cls_rgw_reshard_status::NOT_RESHARDING) {
-    // if in_progress or done then we have an old BucketInfo
-    cerr << "ERROR: the bucket is currently undergoing resharding and "
-      "cannot be added to the reshard list at this time" << std::endl;
-    return -EBUSY;
-  }
-
   int num_source_shards = ((*bucket)->get_info().layout.current_index.layout.normal.num_shards > 0 ? (*bucket)->get_info().layout.current_index.layout.normal.num_shards : 1);
 
   if (num_shards <= num_source_shards && !yes_i_really_mean_it) {