Merge pull request ceph#60403 from trociny/wip-68206

rgw: trigger resharding of versioned buckets sooner

Reviewed-by: J. Eric Ivancich <[email protected]>

Author: cbodley

src/rgw/driver/rados/rgw_rados.cc

@@ -10815,6 +10815,7 @@ int RGWRados::cls_bucket_head_async(const DoutPrefixProvider *dpp, const RGWBuck
 
 // uses information that the store has easy access to transition to the shard calculatoin logic
 void RGWRados::calculate_preferred_shards(const DoutPrefixProvider* dpp,
+					  bool is_versioned,
 					  const uint64_t num_objs,
 					  const uint32_t num_source_shards,
 					  const uint32_t min_layout_shards,
@@ -10823,8 +10824,16 @@ void RGWRados::calculate_preferred_shards(const DoutPrefixProvider* dpp,
 {
   const uint32_t max_dynamic_shards =
     uint32_t(cct->_conf.get_val<uint64_t>("rgw_max_dynamic_shards"));
-  const uint64_t max_objs_per_shard =
+  uint64_t max_objs_per_shard =
     cct->_conf.get_val<uint64_t>("rgw_max_objs_per_shard");
+
+  if (is_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.
+    max_objs_per_shard /= 3;
+  }
+
   const bool is_multisite = svc.zone->need_to_log_data();
 
   RGWBucketReshard::calculate_preferred_shards(dpp,
@@ -10861,12 +10870,13 @@ int RGWRados::check_bucket_shards(const RGWBucketInfo& bucket_info,
 
   bool need_resharding = false;
   uint32_t suggested_num_shards = 0;
+  const bool is_versioned = bucket_info.versioned();
   const uint32_t num_source_shards =
     rgw::current_num_shards(bucket_info.layout);
   const uint32_t min_layout_shards =
     rgw::current_min_layout_shards(bucket_info.layout);
 
-  calculate_preferred_shards(dpp, num_objs,
+  calculate_preferred_shards(dpp, is_versioned, num_objs,
 			     num_source_shards, min_layout_shards,
 			     need_resharding, &suggested_num_shards);
   if (! need_resharding) {

src/rgw/driver/rados/rgw_rados.h

@@ -1628,6 +1628,7 @@ int restore_obj_from_cloud(RGWLCCloudTierCtx& tier_ctx,
 		  optional_yield y, bool check_size_only = false);
 
   void calculate_preferred_shards(const DoutPrefixProvider* dpp,
+				  bool is_versioned,
 				  const uint64_t num_objs,
 				  const uint32_t current_shard_count,
 				  const uint32_t min_layout_shards,

src/rgw/driver/rados/rgw_reshard.cc

@@ -1642,6 +1642,7 @@ int RGWReshard::process_entry(const cls_rgw_reshard_entry& entry,
       num_entries += s.second.num_objects;
     }
 
+    const bool is_versioned = bucket_info.versioned();
     const uint32_t current_shard_count =
       rgw::current_num_shards(bucket_info.layout);
     const uint32_t min_layout_shards =
@@ -1653,7 +1654,7 @@ int RGWReshard::process_entry(const cls_rgw_reshard_entry& entry,
     // needed to perform the calculation before calling
     // calculating_preferred_shards() in this class
     store->getRados()->calculate_preferred_shards(
-      dpp, num_entries, current_shard_count, min_layout_shards,
+      dpp, is_versioned, num_entries, current_shard_count, min_layout_shards,
       needs_resharding, &suggested_shard_count);
 
     // if we no longer need resharding or currently need to expand