Merge pull request ceph#63443 from ivancich/wip-dbr-versioned

ivancich · web-flow · commit df04e2548a04 · 2025-06-20T14:01:32.000-06:00
rgw: make sure max_objs_per_shard is appropriate in debugging scenarios

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
@@ -11151,6 +11151,10 @@ void RGWRados::calculate_preferred_shards(const DoutPrefixProvider* dpp,
     max_objs_per_shard /= 3;
   }
 
+  // make sure it's at least 1, as in some testing scenarios it's artificially low
+  constexpr uint64_t min_max_objs_per_shard = 1;
+  max_objs_per_shard = std::max(min_max_objs_per_shard, max_objs_per_shard);
+
   const bool is_multisite = svc.zone->need_to_log_data();
 
   RGWBucketReshard::calculate_preferred_shards(dpp,

Original file line number	Diff line number	Diff line change
`@@ -11151,6 +11151,10 @@ void RGWRados::calculate_preferred_shards(const DoutPrefixProvider* dpp,`
`11151`	`11151`	`max_objs_per_shard /= 3;`
`11152`	`11152`	`}`
`11153`	`11153`
	`11154`	`+ // make sure it's at least 1, as in some testing scenarios it's artificially low`
	`11155`	`+ constexpr uint64_t min_max_objs_per_shard = 1;`
	`11156`	`+ max_objs_per_shard = std::max(min_max_objs_per_shard, max_objs_per_shard);`
	`11157`	`+`
`11154`	`11158`	`const bool is_multisite = svc.zone->need_to_log_data();`
`11155`	`11159`
`11156`	`11160`	`RGWBucketReshard::calculate_preferred_shards(dpp,`