Skip to content

Commit 52d5fbb

Browse files
committed
Graduate instance limits from experimental
Remove experimental markers for ingester and distributor instance limits: - Remove WarnExperimentalUse("ingester instance limits") conditional block - Remove WarnExperimentalUse("distributor instance limits") conditional block - Remove from experimental features list in v1-guarantees.md Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>
1 parent c8a51d8 commit 52d5fbb

3 files changed

Lines changed: 0 additions & 10 deletions

File tree

docs/configuration/v1-guarantees.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ Currently experimental features are:
7070
- `-tenant-federation.user-sync-interval`
7171
- The thanosconvert tool for converting Thanos block metadata to Cortex
7272
- HA Tracker: cleanup of old replicas from KV Store.
73-
- Instance limits in ingester and distributor
7473
- Exemplar storage, currently in-memory only within the Ingester based on Prometheus exemplar storage (`-blocks-storage.tsdb.max-exemplars`)
7574
- Querier limits:
7675
- `-querier.max-fetched-chunks-per-query`

pkg/distributor/distributor.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,6 @@ func New(cfg Config, clientConfig ingester_client.Config, limits *validation.Ove
480480
}
481481

482482
func (d *Distributor) starting(ctx context.Context) error {
483-
if d.cfg.InstanceLimits != (InstanceLimits{}) {
484-
util_log.WarnExperimentalUse("distributor instance limits")
485-
}
486-
487483
// Only report success if all sub-services start properly
488484
return services.StartManagerAndAwaitHealthy(ctx, d.subservices)
489485
}

pkg/ingester/ingester.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,11 +1029,6 @@ func (i *Ingester) stopping(_ error) error {
10291029
}
10301030

10311031
func (i *Ingester) updateLoop(ctx context.Context) error {
1032-
if limits := i.getInstanceLimits(); limits != nil && *limits != (InstanceLimits{}) {
1033-
// This check will not cover enabling instance limits in runtime, but it will do for now.
1034-
logutil.WarnExperimentalUse("ingester instance limits")
1035-
}
1036-
10371032
rateUpdateTicker := time.NewTicker(i.cfg.RateUpdatePeriod)
10381033
defer rateUpdateTicker.Stop()
10391034

0 commit comments

Comments
 (0)