From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 1 Mar 2023 15:44:31 +0000 (-0500)
Subject: rgw/reshard: refuse to reshard to new_num_shards=0
X-Git-Tag: v19.0.0~1639^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4db197e858a4cedef4ad86af66d9b2cd2f4e4e31;p=ceph.git

rgw/reshard: refuse to reshard to new_num_shards=0

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_reshard.cc b/src/rgw/driver/rados/rgw_reshard.cc
index 6c262c658c9c..01d917022d30 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;