Skip to content

Commit 237ff8c

Browse files
SungJin1212bogdan-st
SungJin1212
authored and
bogdan-st
committed
refactor: delete a NumOverrides error (cortexproject#6837)
Signed-off-by: SungJin1212 <[email protected]>
1 parent 588cd93 commit 237ff8c

23 files changed

+70
-136
lines changed

‎pkg/alertmanager/multitenant_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,7 @@ receivers:
558558
flagext.DefaultValues(&limits)
559559
limits.AlertmanagerReceiversBlockPrivateAddresses = firewallEnabled
560560

561-
overrides, err := validation.NewOverrides(limits, nil)
562-
require.NoError(t, err)
561+
overrides := validation.NewOverrides(limits, nil)
563562

564563
// Start the alertmanager.
565564
reg := prometheus.NewPedanticRegistry()
@@ -1778,8 +1777,7 @@ func TestAlertmanager_StateReplicationWithSharding(t *testing.T) {
17781777
var limits validation.Limits
17791778
flagext.DefaultValues(&limits)
17801779

1781-
overrides, err := validation.NewOverrides(limits, nil)
1782-
require.NoError(t, err)
1780+
overrides := validation.NewOverrides(limits, nil)
17831781

17841782
reg := prometheus.NewPedanticRegistry()
17851783
am, err := createMultitenantAlertmanager(amConfig, nil, nil, mockStore, ringStore, overrides, log.NewNopLogger(), reg)
@@ -1976,8 +1974,7 @@ func TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers(t *testi
19761974
var limits validation.Limits
19771975
flagext.DefaultValues(&limits)
19781976

1979-
overrides, err := validation.NewOverrides(limits, nil)
1980-
require.NoError(t, err)
1977+
overrides := validation.NewOverrides(limits, nil)
19811978

19821979
reg := prometheus.NewPedanticRegistry()
19831980
am, err := createMultitenantAlertmanager(amConfig, nil, nil, mockStore, ringStore, overrides, log.NewNopLogger(), reg)

‎pkg/compactor/compactor_paritioning_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,7 @@ func prepareForPartitioning(t *testing.T, compactorCfg Config, bucketClient objs
14351435
flagext.DefaultValues(limits)
14361436
}
14371437

1438-
overrides, err := validation.NewOverrides(*limits, nil)
1439-
require.NoError(t, err)
1438+
overrides := validation.NewOverrides(*limits, nil)
14401439

14411440
bucketClientFactory := func(ctx context.Context) (objstore.InstrumentedBucket, error) {
14421441
return bucketClient, nil

‎pkg/compactor/compactor_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,8 +1585,7 @@ func prepare(t *testing.T, compactorCfg Config, bucketClient objstore.Instrument
15851585
flagext.DefaultValues(limits)
15861586
}
15871587

1588-
overrides, err := validation.NewOverrides(*limits, nil)
1589-
require.NoError(t, err)
1588+
overrides := validation.NewOverrides(*limits, nil)
15901589

15911590
bucketClientFactory := func(ctx context.Context) (objstore.InstrumentedBucket, error) {
15921591
return bucketClient, nil
@@ -2295,7 +2294,7 @@ func TestCompactor_GetShardSizeForUser(t *testing.T) {
22952294
cfg.ShardingRing.KVStore.Mock = kvstore
22962295

22972296
// Compactor will get its own temp dir for storing local files.
2298-
overrides, _ := validation.NewOverrides(validation.Limits{}, tenantLimits)
2297+
overrides := validation.NewOverrides(validation.Limits{}, tenantLimits)
22992298
compactor, _, tsdbPlanner, _, _ := prepare(t, cfg, inmem, nil)
23002299
compactor.limits = overrides
23012300
//compactor.limits.tenantLimits = tenantLimits
@@ -2344,7 +2343,7 @@ func TestCompactor_GetShardSizeForUser(t *testing.T) {
23442343
cfg.ShardingRing.KVStore.Mock = kvstore
23452344

23462345
// Compactor will get its own temp dir for storing local files.
2347-
overrides, _ := validation.NewOverrides(validation.Limits{}, tenantLimits)
2346+
overrides := validation.NewOverrides(validation.Limits{}, tenantLimits)
23482347
compactor, _, tsdbPlanner, _, _ := prepare(t, cfg, inmem, nil)
23492348
compactor.limits = overrides
23502349
//compactor.limits.tenantLimits = tenantLimits

‎pkg/compactor/partition_compaction_grouper_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2048,8 +2048,7 @@ func TestPartitionCompactionGrouper_GenerateCompactionJobs(t *testing.T) {
20482048
limits := &validation.Limits{
20492049
CompactorPartitionSeriesCount: 4,
20502050
}
2051-
overrides, err := validation.NewOverrides(*limits, nil)
2052-
require.NoError(t, err)
2051+
overrides := validation.NewOverrides(*limits, nil)
20532052

20542053
// Setup mocking of the ring so that the grouper will own all the shards
20552054
rs := ring.ReplicationSet{

‎pkg/compactor/shuffle_sharding_grouper_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,7 @@ func TestShuffleShardingGrouper_Groups(t *testing.T) {
330330
}
331331

332332
limits := &validation.Limits{}
333-
overrides, err := validation.NewOverrides(*limits, nil)
334-
require.NoError(t, err)
333+
overrides := validation.NewOverrides(*limits, nil)
335334

336335
// Setup mocking of the ring so that the grouper will own all the shards
337336
rs := ring.ReplicationSet{

‎pkg/cortex/modules.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ func (t *Cortex) initRuntimeConfig() (services.Service, error) {
199199
return serv, err
200200
}
201201

202-
func (t *Cortex) initOverrides() (serv services.Service, err error) {
203-
t.Overrides, err = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
202+
func (t *Cortex) initOverrides() (services.Service, error) {
203+
t.Overrides = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
204204
// overrides don't have operational state, nor do they need to do anything more in starting/stopping phase,
205205
// so there is no need to return any service.
206-
return nil, err
206+
return nil, nil
207207
}
208208

209209
func (t *Cortex) initOverridesExporter() (services.Service, error) {

‎pkg/distributor/distributor_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,8 +2488,7 @@ func BenchmarkDistributor_Push(b *testing.B) {
24882488
}
24892489
distributorCfg.UseStreamPush = false
24902490

2491-
overrides, err := validation.NewOverrides(limits, nil)
2492-
require.NoError(b, err)
2491+
overrides := validation.NewOverrides(limits, nil)
24932492

24942493
// Start the distributor.
24952494
distributor, err := New(distributorCfg, clientConfig, overrides, ingestersRing, true, prometheus.NewRegistry(), log.NewNopLogger())
@@ -3121,8 +3120,7 @@ func prepare(tb testing.TB, cfg prepConfig) ([]*Distributor, []*mockIngester, []
31213120
cfg.limits.HAMaxClusters = 100
31223121
}
31233122

3124-
overrides, err := validation.NewOverrides(*cfg.limits, nil)
3125-
require.NoError(tb, err)
3123+
overrides := validation.NewOverrides(*cfg.limits, nil)
31263124

31273125
reg := prometheus.NewPedanticRegistry()
31283126
d, err := New(distributorCfg, clientConfig, overrides, ingestersRing, true, reg, log.NewNopLogger())
@@ -4336,8 +4334,7 @@ func TestDistributor_PushLabelSetMetrics(t *testing.T) {
43364334
{Hash: 4, LabelSet: labels.FromStrings("cluster", "four")},
43374335
{Hash: 2, LabelSet: labels.EmptyLabels()},
43384336
}
4339-
ds[0].limits, err = validation.NewOverrides(limits, nil)
4340-
require.NoError(t, err)
4337+
ds[0].limits = validation.NewOverrides(limits, nil)
43414338
ds[0].updateLabelSetMetrics()
43424339
// Old label set metrics are removed. New label set metrics will be added when
43434340
// new requests come in.

‎pkg/distributor/ingestion_rate_strategy_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ func TestIngestionRateStrategy(t *testing.T) {
9797
var nativeHistogramsStrategy limiter.RateLimiterStrategy
9898

9999
// Init limits overrides
100-
overrides, err := validation.NewOverrides(testData.limits, nil)
101-
require.NoError(t, err)
100+
overrides := validation.NewOverrides(testData.limits, nil)
102101

103102
// Instance the strategy
104103
switch testData.limits.IngestionRateStrategy {

‎pkg/ingester/ingester_test.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4010,10 +4010,7 @@ func prepareIngesterWithBlocksStorageAndLimits(t testing.TB, ingesterCfg Config,
40104010

40114011
bucketDir := t.TempDir()
40124012

4013-
overrides, err := validation.NewOverrides(limits, tenantLimits)
4014-
if err != nil {
4015-
return nil, err
4016-
}
4013+
overrides := validation.NewOverrides(limits, tenantLimits)
40174014

40184015
ingesterCfg.BlocksStorageConfig.TSDB.Dir = dataDir
40194016
ingesterCfg.BlocksStorageConfig.Bucket.Backend = "filesystem"
@@ -4180,8 +4177,7 @@ func TestIngester_OpenExistingTSDBOnStartup(t *testing.T) {
41804177
t.Run(testName, func(t *testing.T) {
41814178
limits := defaultLimitsTestConfig()
41824179

4183-
overrides, err := validation.NewOverrides(limits, nil)
4184-
require.NoError(t, err)
4180+
overrides := validation.NewOverrides(limits, nil)
41854181

41864182
// Create a temporary directory for TSDB
41874183
tempDir := t.TempDir()
@@ -5395,8 +5391,7 @@ func TestHeadCompactionOnStartup(t *testing.T) {
53955391

53965392
limits := defaultLimitsTestConfig()
53975393

5398-
overrides, err := validation.NewOverrides(limits, nil)
5399-
require.NoError(t, err)
5394+
overrides := validation.NewOverrides(limits, nil)
54005395

54015396
ingesterCfg := defaultIngesterTestConfig(t)
54025397
ingesterCfg.BlocksStorageConfig.TSDB.Dir = tempDir

‎pkg/ingester/limiter_test.go‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/prometheus/prometheus/model/labels"
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/mock"
12-
"github.com/stretchr/testify/require"
1312

1413
"github.com/cortexproject/cortex/pkg/util"
1514
"github.com/cortexproject/cortex/pkg/util/validation"
@@ -221,8 +220,7 @@ func runLimiterMaxFunctionTest(
221220
limits := validation.Limits{IngestionTenantShardSize: testData.shardSize}
222221
applyLimits(&limits, testData.localLimit, testData.globalLimit)
223222

224-
overrides, err := validation.NewOverrides(limits, nil)
225-
require.NoError(t, err)
223+
overrides := validation.NewOverrides(limits, nil)
226224

227225
// Assert on default sharding strategy.
228226
limiter := NewLimiter(overrides, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, testData.ringZoneAwarenessEnabled, "")
@@ -286,11 +284,10 @@ func TestLimiter_AssertMaxSeriesPerMetric(t *testing.T) {
286284
ring.On("ZonesCount").Return(1)
287285

288286
// Mock limits
289-
limits, err := validation.NewOverrides(validation.Limits{
287+
limits := validation.NewOverrides(validation.Limits{
290288
MaxLocalSeriesPerMetric: testData.maxLocalSeriesPerMetric,
291289
MaxGlobalSeriesPerMetric: testData.maxGlobalSeriesPerMetric,
292290
}, nil)
293-
require.NoError(t, err)
294291

295292
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
296293
actual := limiter.AssertMaxSeriesPerMetric("test", testData.series)
@@ -348,11 +345,10 @@ func TestLimiter_AssertMaxMetadataPerMetric(t *testing.T) {
348345
ring.On("ZonesCount").Return(1)
349346

350347
// Mock limits
351-
limits, err := validation.NewOverrides(validation.Limits{
348+
limits := validation.NewOverrides(validation.Limits{
352349
MaxLocalMetadataPerMetric: testData.maxLocalMetadataPerMetric,
353350
MaxGlobalMetadataPerMetric: testData.maxGlobalMetadataPerMetric,
354351
}, nil)
355-
require.NoError(t, err)
356352

357353
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
358354
actual := limiter.AssertMaxMetadataPerMetric("test", testData.metadata)
@@ -411,11 +407,10 @@ func TestLimiter_AssertMaxSeriesPerUser(t *testing.T) {
411407
ring.On("ZonesCount").Return(1)
412408

413409
// Mock limits
414-
limits, err := validation.NewOverrides(validation.Limits{
410+
limits := validation.NewOverrides(validation.Limits{
415411
MaxLocalSeriesPerUser: testData.maxLocalSeriesPerUser,
416412
MaxGlobalSeriesPerUser: testData.maxGlobalSeriesPerUser,
417413
}, nil)
418-
require.NoError(t, err)
419414

420415
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
421416
actual := limiter.AssertMaxSeriesPerUser("test", testData.series)
@@ -496,8 +491,7 @@ func TestLimiter_AssertMaxSeriesPerLabelSet(t *testing.T) {
496491
ring.On("ZonesCount").Return(1)
497492

498493
// Mock limits
499-
limits, err := validation.NewOverrides(testData.limits, nil)
500-
require.NoError(t, err)
494+
limits := validation.NewOverrides(testData.limits, nil)
501495

502496
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
503497
actual := limiter.AssertMaxSeriesPerLabelSet("test", labels.FromStrings("foo", "bar"), func(limits []validation.LimitsPerLabelSet, limit validation.LimitsPerLabelSet) (int, error) {
@@ -558,11 +552,10 @@ func TestLimiter_AssertMaxMetricsWithMetadataPerUser(t *testing.T) {
558552
ring.On("ZonesCount").Return(1)
559553

560554
// Mock limits
561-
limits, err := validation.NewOverrides(validation.Limits{
555+
limits := validation.NewOverrides(validation.Limits{
562556
MaxLocalMetricsWithMetadataPerUser: testData.maxLocalMetadataPerUser,
563557
MaxGlobalMetricsWithMetadataPerUser: testData.maxGlobalMetadataPerUser,
564558
}, nil)
565-
require.NoError(t, err)
566559

567560
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, testData.shardByAllLabels, testData.ringReplicationFactor, false, "")
568561
actual := limiter.AssertMaxMetricsWithMetadataPerUser("test", testData.metadata)
@@ -579,13 +572,12 @@ func TestLimiter_FormatError(t *testing.T) {
579572
ring.On("ZonesCount").Return(1)
580573

581574
// Mock limits
582-
limits, err := validation.NewOverrides(validation.Limits{
575+
limits := validation.NewOverrides(validation.Limits{
583576
MaxGlobalSeriesPerUser: 100,
584577
MaxGlobalSeriesPerMetric: 20,
585578
MaxGlobalMetricsWithMetadataPerUser: 10,
586579
MaxGlobalMetadataPerMetric: 3,
587580
}, nil)
588-
require.NoError(t, err)
589581

590582
limiter := NewLimiter(limits, ring, util.ShardingStrategyDefault, true, 3, false, "please contact administrator to raise it")
591583
lbls := labels.FromStrings(labels.MetricName, "testMetric")

0 commit comments

Comments
 (0)