rgw: scale shards based on versioned() to cover suspended buckets

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

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index a18b8e4640b68457571712f74eed50f0551b97d7..c3fe6ce24c379865e625c3f8774bb59eeed41869 100644 (file)
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -10515,7 +10515,7 @@ int RGWRados::check_bucket_shards(const RGWBucketInfo& bucket_info,
   uint64_t max_objs_per_shard =
     cct->_conf.get_val<uint64_t>("rgw_max_objs_per_shard");
 
-  if (bucket_info.versioning_enabled()) {
+  if (bucket_info.versioned()) {
     // Since each versioned bucket requires 4 entries for the first object
     // and 2 additional entries for each additional object, we want to
     // trigger resharding sooner.