Refactor implementation and add unit tests

wilguo · wilguo · commit 504c3f61cd1f · 2025-03-31T15:43:21.000-07:00
Signed-off-by: Wilbert Guo &lt;wilbeguo@amazon.com&gt;
diff --git a/pkg/ruler/ruler.go b/pkg/ruler/ruler.go
@@ -1343,8 +1343,8 @@ func (r *Ruler) getShardSizeForUser(userID string) int {
 func (r *Ruler) getShardedRules(ctx context.Context, userID string, rulesRequest RulesRequest) (*RulesResponse, error) {
 	ring := ring.ReadRing(r.ring)
 
-	if shardSize := r.limits.RulerTenantShardSize(userID); shardSize > 0 && r.cfg.ShardingStrategy == util.ShardingStrategyShuffle {
-		shardSize := util.DynamicShardSize(shardSize, r.ring.InstancesCount())
+	if r.cfg.ShardingStrategy == util.ShardingStrategyShuffle {
+		shardSize := r.getShardSizeForUser(userID)
 		ring = r.ring.ShuffleShard(userID, shardSize)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1343,8 +1343,8 @@ func (r *Ruler) getShardSizeForUser(userID string) int {`
`1343`	`1343`	`func (r Ruler) getShardedRules(ctx context.Context, userID string, rulesRequest RulesRequest) (RulesResponse, error) {`
`1344`	`1344`	`ring := ring.ReadRing(r.ring)`
`1345`	`1345`
`1346`		`- if shardSize := r.limits.RulerTenantShardSize(userID); shardSize > 0 && r.cfg.ShardingStrategy == util.ShardingStrategyShuffle {`
`1347`		`- shardSize := util.DynamicShardSize(shardSize, r.ring.InstancesCount())`
	`1346`	`+ if r.cfg.ShardingStrategy == util.ShardingStrategyShuffle {`
	`1347`	`+ shardSize := r.getShardSizeForUser(userID)`
`1348`	`1348`	`ring = r.ring.ShuffleShard(userID, shardSize)`
`1349`	`1349`	`}`
`1350`	`1350`