Remove default shardsize value

Signed-off-by: Wilbert Guo <[email protected]>

Author: wilguo

pkg/ruler/ruler.go

@@ -89,8 +89,6 @@ const (
 	// query response formats
 	queryResponseFormatJson     = "json"
 	queryResponseFormatProtobuf = "protobuf"
-
-	defaultRulerShardSizePercentage = 0.4
 )
 
 type DisabledRuleGroupErr struct {
@@ -1331,14 +1329,11 @@ func (r *Ruler) getShardSizeForUser(userID string) int {
 		// A shard size of 0 means shuffle sharding is disabled for this specific user.
 		// In that case we use the full ring so that rule groups will be sharded across all rulers.
 		return numInstances
-	} else if rulerTenantShardSize > 0 {
-		newShardSize = util.DynamicShardSize(rulerTenantShardSize, numInstances)
-	} else {
-		newShardSize = util.DynamicShardSize(defaultRulerShardSizePercentage, numInstances)
 	}
 
-	// We want to guarantee that shard size will be at least 1
-	return max(newShardSize, 1)
+	newShardSize = util.DynamicShardSize(rulerTenantShardSize, numInstances)
+	// We want to guarantee that shard size will be at replication factor
+	return max(newShardSize, r.cfg.Ring.ReplicationFactor)
 }
 
 func (r *Ruler) getShardedRules(ctx context.Context, userID string, rulesRequest RulesRequest) (*RulesResponse, error) {

pkg/ruler/ruler_test.go

@@ -3108,66 +3108,59 @@ func TestRuler_QueryOffset(t *testing.T) {
 func TestGetShardSizeForUser(t *testing.T) {
 	tests := []struct {
 		name               string
-		tenantShardSize    float64
 		userID             string
+		replicationFactor  int
 		rulerInstanceCount int
+		tenantShardSize    float64
 		expectedShardSize  int
 	}{
 		{
 			name:               "User with fixed shard size with 10 ruler instances",
 			userID:             "user1",
 			rulerInstanceCount: 10,
+			replicationFactor:  1,
 			tenantShardSize:    2,
 			expectedShardSize:  2,
 		},
 		{
 			name:               "User with fixed shard size with 50 ruler instances",
 			userID:             "user1",
 			rulerInstanceCount: 50,
+			replicationFactor:  1,
 			tenantShardSize:    30,
 			expectedShardSize:  30,
 		},
 		{
 			name:               "User with percentage shard size with 10 ruler instances",
 			userID:             "user1",
 			rulerInstanceCount: 10,
+			replicationFactor:  1,
 			tenantShardSize:    0.6,
 			expectedShardSize:  6,
 		},
 		{
 			name:               "User with percentage shard size with 80 ruler instances",
 			userID:             "user1",
 			rulerInstanceCount: 80,
+			replicationFactor:  1,
 			tenantShardSize:    0.25,
 			expectedShardSize:  20,
 		},
-		{
-			name:               "User with invalid negative shard size",
-			userID:             "user1",
-			rulerInstanceCount: 10,
-			tenantShardSize:    -1,
-			expectedShardSize:  4,
-		},
 		{
 			name:               "User with default 0 shard size",
 			userID:             "user1",
 			rulerInstanceCount: 10,
+			replicationFactor:  1,
 			tenantShardSize:    0,
 			expectedShardSize:  10,
 		},
 		{
-			name:               "User with greater shard size than number of ruler instances",
+			name:               "Ensure shard size is at least replication factor",
 			userID:             "user1",
 			rulerInstanceCount: 10,
-			tenantShardSize:    15,
-			expectedShardSize:  15,
-		},
-		{
-			name:               "Ensure smallest shard size will be 1",
-			userID:             "user1",
-			rulerInstanceCount: 1,
-			tenantShardSize:    0.5,
-			expectedShardSize:  1,
+			replicationFactor:  3,
+			tenantShardSize:    0.1,
+			expectedShardSize:  3,
 		},
 	}
 
@@ -3206,7 +3199,7 @@ func TestGetShardSizeForUser(t *testing.T) {
 					KVStore: kv.Config{
 						Mock: kvStore,
 					},
-					ReplicationFactor:    1,
+					ReplicationFactor:    tc.replicationFactor,
 					ZoneAwarenessEnabled: true,
 					InstanceZone:         rulerAZEvenSpread[id],
 				}