Skip to content

Commit 3225931

Browse files
committed
Re-introduced -distributor.limiter-reload-period but deprecated
Signed-off-by: Marco Pracucci <marco@pracucci.com>
1 parent c5bb061 commit 3225931

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* `ruler.storage.type` has beem added to specify the rule store backend type, currently only the configdb.
1111
* `ruler.poll-interval` has been added to specify the interval in which to poll new rule groups.
1212
* [FEATURE] The distributor can now drop labels from samples (similar to the removal of the replica label for HA ingestion) per user via the `distributor.drop-label` flag. #1726
13-
* [FEATURE] Added `global` ingestion rate limiter strategy. Removed `-distributor.limiter-reload-period` flag. #1766
13+
* [FEATURE] Added `global` ingestion rate limiter strategy. Deprecated `-distributor.limiter-reload-period` flag. #1766
1414
* [BUGFIX] Fixed unnecessary CAS operations done by the HA tracker when the jitter is enabled. #1861
1515

1616
## 0.4.0 / 2019-12-02

pkg/distributor/distributor.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/cortexproject/cortex/pkg/ring"
2424
"github.com/cortexproject/cortex/pkg/util"
2525
"github.com/cortexproject/cortex/pkg/util/extract"
26+
"github.com/cortexproject/cortex/pkg/util/flagext"
2627
"github.com/cortexproject/cortex/pkg/util/limiter"
2728
"github.com/cortexproject/cortex/pkg/util/validation"
2829
billing "github.com/weaveworks/billing-client"
@@ -145,6 +146,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
145146
f.IntVar(&cfg.MaxRecvMsgSize, "distributor.max-recv-msg-size", 100<<20, "remote_write API max receive message size (bytes).")
146147
f.DurationVar(&cfg.RemoteTimeout, "distributor.remote-timeout", 2*time.Second, "Timeout for downstream ingesters.")
147148
f.DurationVar(&cfg.ExtraQueryDelay, "distributor.extra-query-delay", 0, "Time to wait before sending more than the minimum successful query requests.")
149+
flagext.DeprecatedFlag(f, "distributor.limiter-reload-period", "DEPRECATED. No more required because the local limiter is reconfigured as soon as the overrides change.")
148150
f.BoolVar(&cfg.ShardByAllLabels, "distributor.shard-by-all-labels", false, "Distribute samples based on all labels, as opposed to solely by user and metric name.")
149151
}
150152

0 commit comments

Comments
 (0)