Remove deprecated flags from months ago (#2339)

gouthamve · web-flow · commit 6684bff2e458 · 2020-03-28T15:43:27.000Z
Signed-off-by: Goutham Veeramachaneni &lt;gouthamve@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## master / unreleased
 
+* [CHANGE] Remove the following deprecated flags:
+  - `-metrics.error-rate-query` (use `-metrics.write-throttle-query` instead).
+  - `-store.cardinality-cache-size` (use `-store.index-cache-read.enable-fifocache` and `-store.index-cache-read.fifocache.size` instead).
+  - `-store.cardinality-cache-validity` (use `-store.index-cache-read.enable-fifocache` and `-store.index-cache-read.fifocache.duration` instead).
+  - `-distributor.limiter-reload-period` (flag unused)
+  - `-ingester.claim-on-rollout` (flag unused)
+  - `-ingester.normalise-tokens` (flag unused)
 * [CHANGE] Renamed YAML file options to be more consistent. See full config file changes below. #2273
 * [CHANGE] Renamed the `memcache.write-back-goroutines` and `memcache.write-back-buffer` flags to `background.write-back-concurrency` and `background.write-back-buffer`. This affects the following flags:
   - `-frontend.memcache.write-back-buffer` --> `-frontend.background.write-back-buffer` 
diff --git a/development/tsdb-blocks-storage-s3-single-binary/config/cortex.yaml b/development/tsdb-blocks-storage-s3-single-binary/config/cortex.yaml
@@ -18,7 +18,6 @@ ingester:
   lifecycler:
     # We want to start immediately.
     join_after: 0
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/development/tsdb-blocks-storage-s3/config/cortex.yaml b/development/tsdb-blocks-storage-s3/config/cortex.yaml
@@ -18,7 +18,6 @@ ingester:
   lifecycler:
     # We want to start immediately.
     join_after: 0
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/docs/configuration/single-process-config-blocks-gossip-1.yaml b/docs/configuration/single-process-config-blocks-gossip-1.yaml
@@ -48,7 +48,6 @@ ingester:
     # ingesters joining at the same time can have conflicting tokens if they don't see each other yet.
     observe_period: 10s
     min_ready_duration: 0s
-    claim_on_rollout: false
     final_sleep: 5s
     num_tokens: 512
 
diff --git a/docs/configuration/single-process-config-blocks-gossip-2.yaml b/docs/configuration/single-process-config-blocks-gossip-2.yaml
@@ -47,7 +47,6 @@ ingester:
     # ingesters joining at the same time can have conflicting tokens if they don't see each other yet.
     observe_period: 10s
     min_ready_duration: 0s
-    claim_on_rollout: false
     final_sleep: 5s
     num_tokens: 512
 
diff --git a/docs/configuration/single-process-config-blocks.yaml b/docs/configuration/single-process-config-blocks.yaml
@@ -39,7 +39,6 @@ ingester:
     # We want to start immediately and flush on shutdown.
     join_after: 0
     min_ready_duration: 0s
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/docs/configuration/single-process-config.md b/docs/configuration/single-process-config.md
@@ -44,7 +44,6 @@ ingester:
 
     # We want to start immediately and flush on shutdown.
     join_after: 0
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/docs/configuration/single-process-config.yaml b/docs/configuration/single-process-config.yaml
@@ -41,7 +41,6 @@ ingester:
     # We want to start immediately and flush on shutdown.
     join_after: 0
     min_ready_duration: 0s
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/docs/guides/cortex-with-cassandra.md b/docs/guides/cortex-with-cassandra.md
@@ -79,7 +79,6 @@ ingester:
 
     # We want to start immediately and flush on shutdown.
     join_after: 0
-    claim_on_rollout: false
     final_sleep: 0s
     num_tokens: 512
 
diff --git a/k8s/ingester-dep.yaml b/k8s/ingester-dep.yaml
@@ -42,7 +42,6 @@ spec:
         args:
         - -target=ingester
         - -ingester.join-after=30s
-        - -ingester.claim-on-rollout=true
         - -consul.hostname=consul.default.svc.cluster.local:8500
         - -s3.url=s3://abc:123@s3.default.svc.cluster.local:4569
         - -dynamodb.url=dynamodb://user:pass@dynamodb.default.svc.cluster.local:8000
diff --git a/pkg/chunk/aws/metrics_autoscaling.go b/pkg/chunk/aws/metrics_autoscaling.go
@@ -50,8 +50,6 @@ type MetricsAutoScalingConfig struct {
 	UsageQuery       string  `yaml:"write_usage_query"`     // Promql query to fetch write capacity usage per table
 	ReadUsageQuery   string  `yaml:"read_usage_query"`      // Promql query to fetch read usage per table
 	ReadErrorQuery   string  `yaml:"read_error_query"`      // Promql query to fetch read errors per table
-
-	deprecatedErrorRateQuery string
 }
 
 // RegisterFlags adds the flags required to config this to the given FlagSet
@@ -65,8 +63,6 @@ func (cfg *MetricsAutoScalingConfig) RegisterFlags(f *flag.FlagSet) {
 	f.StringVar(&cfg.UsageQuery, "metrics.usage-query", defaultUsageQuery, "query to fetch write capacity usage per table")
 	f.StringVar(&cfg.ReadUsageQuery, "metrics.read-usage-query", defaultReadUsageQuery, "query to fetch read capacity usage per table")
 	f.StringVar(&cfg.ReadErrorQuery, "metrics.read-error-query", defaultReadErrorQuery, "query to fetch read errors per table")
-
-	f.StringVar(&cfg.deprecatedErrorRateQuery, "metrics.error-rate-query", "", "DEPRECATED: use -metrics.write-throttle-query instead")
 }
 
 type metricsData struct {
@@ -83,10 +79,6 @@ type metricsData struct {
 }
 
 func newMetrics(cfg DynamoDBConfig) (*metricsData, error) {
-	if cfg.Metrics.deprecatedErrorRateQuery != "" {
-		level.Warn(util.Logger).Log("msg", "use of deprecated flag -metrics.error-rate-query")
-		cfg.Metrics.ThrottleQuery = cfg.Metrics.deprecatedErrorRateQuery
-	}
 	client, err := promApi.NewClient(promApi.Config{Address: cfg.Metrics.URL})
 	if err != nil {
 		return nil, err
diff --git a/pkg/chunk/chunk_store.go b/pkg/chunk/chunk_store.go
@@ -21,7 +21,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/chunk/cache"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/extract"
-	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/cortexproject/cortex/pkg/util/spanlogger"
 	"github.com/cortexproject/cortex/pkg/util/validation"
 )
@@ -70,10 +69,6 @@ func (cfg *StoreConfig) RegisterFlags(f *flag.FlagSet) {
 
 	f.DurationVar(&cfg.CacheLookupsOlderThan, "store.cache-lookups-older-than", 0, "Cache index entries older than this period. 0 to disable.")
 	f.DurationVar(&cfg.MaxLookBackPeriod, "store.max-look-back-period", 0, "Limit how long back data can be queried")
-
-	// Deprecated.
-	flagext.DeprecatedFlag(f, "store.cardinality-cache-size", "DEPRECATED. Use store.index-cache-read.enable-fifocache and store.index-cache-read.fifocache.size instead.")
-	flagext.DeprecatedFlag(f, "store.cardinality-cache-validity", "DEPRECATED. Use store.index-cache-read.enable-fifocache and store.index-cache-read.fifocache.duration instead.")
 }
 
 // store implements Store
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
@@ -25,7 +25,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/extract"
-	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/cortexproject/cortex/pkg/util/limiter"
 	"github.com/cortexproject/cortex/pkg/util/services"
 	"github.com/cortexproject/cortex/pkg/util/validation"
@@ -146,7 +145,6 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 	f.IntVar(&cfg.MaxRecvMsgSize, "distributor.max-recv-msg-size", 100<<20, "remote_write API max receive message size (bytes).")
 	f.DurationVar(&cfg.RemoteTimeout, "distributor.remote-timeout", 2*time.Second, "Timeout for downstream ingesters.")
 	f.DurationVar(&cfg.ExtraQueryDelay, "distributor.extra-query-delay", 0, "Time to wait before sending more than the minimum successful query requests.")
-	flagext.DeprecatedFlag(f, "distributor.limiter-reload-period", "DEPRECATED. No more required because the local limiter is reconfigured as soon as the overrides change.")
 	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.")
 }
 
diff --git a/pkg/ring/lifecycler.go b/pkg/ring/lifecycler.go
@@ -61,10 +61,6 @@ type LifecyclerConfig struct {
 	Port           int    `doc:"hidden"`
 	ID             string `doc:"hidden"`
 	SkipUnregister bool   `yaml:"-"`
-
-	// graveyard for unused flags.
-	UnusedFlag  bool `yaml:"claim_on_rollout,omitempty"` // DEPRECATED - left for backwards-compatibility
-	UnusedFlag2 bool `yaml:"normalise_tokens,omitempty"` // DEPRECATED - left for backwards-compatibility
 }
 
 // RegisterFlags adds the flags required to config this to the given FlagSet
@@ -87,8 +83,6 @@ func (cfg *LifecyclerConfig) RegisterFlagsWithPrefix(prefix string, f *flag.Flag
 	f.DurationVar(&cfg.JoinAfter, prefix+"join-after", 0*time.Second, "Period to wait for a claim from another member; will join automatically after this.")
 	f.DurationVar(&cfg.ObservePeriod, prefix+"observe-period", 0*time.Second, "Observe tokens after generating to resolve collisions. Useful when using gossiping ring.")
 	f.DurationVar(&cfg.MinReadyDuration, prefix+"min-ready-duration", 1*time.Minute, "Minimum duration to wait before becoming ready. This is to work around race conditions with ingesters exiting and updating the ring.")
-	flagext.DeprecatedFlag(f, prefix+"claim-on-rollout", "DEPRECATED. This feature is no longer optional.")
-	flagext.DeprecatedFlag(f, prefix+"normalise-tokens", "DEPRECATED. This feature is no longer optional.")
 	f.DurationVar(&cfg.FinalSleep, prefix+"final-sleep", 30*time.Second, "Duration to sleep for before exiting, to ensure metrics are scraped.")
 	f.StringVar(&cfg.TokensFilePath, prefix+"tokens-file-path", "", "File path where tokens are stored. If empty, tokens are not stored at shutdown and restored at startup.")
 
