From f241b1222f8068bd75876c466f4d2e125360f68a Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 1 Mar 2023 10:44:31 -0500 Subject: [PATCH] rgw/reshard: refuse to reshard to new_num_shards=0 Signed-off-by: Casey Bodley (cherry picked from commit 4db197e858a4cedef4ad86af66d9b2cd2f4e4e31) --- src/rgw/driver/rados/rgw_reshard.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc index 6c262c658c9..01d917022d3 100644 --- a/src/rgw/driver/rados/rgw_reshard.cc +++ b/src/rgw/driver/rados/rgw_reshard.cc @@ -504,6 +504,11 @@ static int init_reshard(rgw::sal::RadosStore* store, uint32_t new_num_shards, const DoutPrefixProvider *dpp) { + if (new_num_shards == 0) { + ldpp_dout(dpp, 0) << "ERROR: " << __func__ << " got invalid new_num_shards=0" << dendl; + return -EINVAL; + } + int ret = init_target_layout(store, bucket_info, bucket_attrs, fault, new_num_shards, dpp); if (ret < 0) { return ret; -- 2.39.5