From a44c5e0f9e8cc28d8d5a8f7fb7f9a96cf4d4a108 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 1 Feb 2021 12:02:44 -0500 Subject: [PATCH] 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 --- src/rgw/rgw_admin.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index be440f34855d1..3d25ea903f40c 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2935,13 +2935,6 @@ int check_reshard_bucket_params(rgw::sal::RadosStore* store, return ret; } - if ((*bucket)->get_info().layout.resharding != rgw::BucketReshardState::None) { - // 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 = rgw::current_num_shards((*bucket)->get_info().layout); if (num_shards <= num_source_shards && !yes_i_really_mean_it) { -- 2.39.5