don't mark two flags as deprecated

Signed-off-by: Ben Ye <[email protected]>

Author: yeya24

docs/blocks-storage/querier.md

@@ -889,8 +889,6 @@ blocks_storage:
     # CLI flag: -blocks-storage.tsdb.memory-snapshot-on-shutdown
     [memory_snapshot_on_shutdown: <boolean> | default = false]
 
-    # [EXPERIMENTAL] Configures the maximum capacity for out-of-order chunks (in
-    # samples). If set to <=0, default value 32 is assumed.
     # [EXPERIMENTAL] Configures the maximum number of samples per chunk that can
     # be out-of-order.
     # CLI flag: -blocks-storage.tsdb.out-of-order-cap-max

docs/blocks-storage/store-gateway.md

@@ -952,8 +952,6 @@ blocks_storage:
     # CLI flag: -blocks-storage.tsdb.memory-snapshot-on-shutdown
     [memory_snapshot_on_shutdown: <boolean> | default = false]
 
-    # [EXPERIMENTAL] Configures the maximum capacity for out-of-order chunks (in
-    # samples). If set to <=0, default value 32 is assumed.
     # [EXPERIMENTAL] Configures the maximum number of samples per chunk that can
     # be out-of-order.
     # CLI flag: -blocks-storage.tsdb.out-of-order-cap-max

docs/configuration/config-file-reference.md

@@ -2589,13 +2589,11 @@ The `limits_config` configures default and per-tenant limits imposed by Cortex s
 # CLI flag: -validation.max-metadata-length
 [max_metadata_length: <int> | default = 1024]
 
-# Deprecated (use ingester.out-of-order-time-window instead): Reject old
-# samples.
+# Reject old samples.
 # CLI flag: -validation.reject-old-samples
 [reject_old_samples: <boolean> | default = false]
 
-# Deprecated (use ingester.out-of-order-time-window instead): Maximum accepted
-# sample age before rejecting.
+# Maximum accepted sample age before rejecting.
 # CLI flag: -validation.reject-old-samples.max-age
 [reject_old_samples_max_age: <duration> | default = 2w]
 
@@ -3738,8 +3736,6 @@ tsdb:
   # CLI flag: -blocks-storage.tsdb.memory-snapshot-on-shutdown
   [memory_snapshot_on_shutdown: <boolean> | default = false]
 
-  # [EXPERIMENTAL] Configures the maximum capacity for out-of-order chunks (in
-  # samples). If set to <=0, default value 32 is assumed.
   # [EXPERIMENTAL] Configures the maximum number of samples per chunk that can
   # be out-of-order.
   # CLI flag: -blocks-storage.tsdb.out-of-order-cap-max

pkg/ingester/ingester.go

@@ -1846,7 +1846,6 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
 	}
 	// Create a new user database
 	db, err := tsdb.Open(udir, userLogger, tsdbPromReg, &tsdb.Options{
-<<<<<<< HEAD
 		RetentionDuration:              i.cfg.BlocksStorageConfig.TSDB.Retention.Milliseconds(),
 		MinBlockDuration:               blockRanges[0],
 		MaxBlockDuration:               blockRanges[len(blockRanges)-1],
@@ -1862,23 +1861,8 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
 		MaxExemplars:                   int64(i.cfg.BlocksStorageConfig.TSDB.MaxExemplars),
 		HeadChunksWriteQueueSize:       i.cfg.BlocksStorageConfig.TSDB.HeadChunksWriteQueueSize,
 		EnableMemorySnapshotOnShutdown: i.cfg.BlocksStorageConfig.TSDB.MemorySnapshotOnShutdown,
-=======
-		RetentionDuration:         i.cfg.BlocksStorageConfig.TSDB.Retention.Milliseconds(),
-		MinBlockDuration:          blockRanges[0],
-		MaxBlockDuration:          blockRanges[len(blockRanges)-1],
-		NoLockfile:                true,
-		StripeSize:                i.cfg.BlocksStorageConfig.TSDB.StripeSize,
-		HeadChunksWriteBufferSize: i.cfg.BlocksStorageConfig.TSDB.HeadChunksWriteBufferSize,
-		WALCompression:            i.cfg.BlocksStorageConfig.TSDB.WALCompressionEnabled,
-		WALSegmentSize:            i.cfg.BlocksStorageConfig.TSDB.WALSegmentSizeBytes,
-		SeriesLifecycleCallback:   userDB,
-		BlocksToDelete:            userDB.blocksToDelete,
-		EnableExemplarStorage:     enableExemplars,
-		IsolationDisabled:         true,
-		MaxExemplars:              int64(i.cfg.BlocksStorageConfig.TSDB.MaxExemplars),
-		OutOfOrderTimeWindow:      time.Duration(i.limits.OutOfOrderTimeWindow(userID)).Milliseconds(),
-		OutOfOrderCapMax:          i.cfg.BlocksStorageConfig.TSDB.OutOfOrderCapMax,
->>>>>>> 75f817aec (support out of order samples ingestion feature)
+		OutOfOrderTimeWindow:           time.Duration(i.limits.OutOfOrderTimeWindow(userID)).Milliseconds(),
+		OutOfOrderCapMax:               i.cfg.BlocksStorageConfig.TSDB.OutOfOrderCapMax,
 	}, nil)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to open TSDB: %s", udir)

pkg/util/validation/limits.go

@@ -136,9 +136,9 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) {
 	f.IntVar(&l.MaxLabelNamesPerSeries, "validation.max-label-names-per-series", 30, "Maximum number of label names per series.")
 	f.IntVar(&l.MaxLabelsSizeBytes, "validation.max-labels-size-bytes", 0, "Maximum combined size in bytes of all labels and label values accepted for a series. 0 to disable the limit.")
 	f.IntVar(&l.MaxMetadataLength, "validation.max-metadata-length", 1024, "Maximum length accepted for metric metadata. Metadata refers to Metric Name, HELP and UNIT.")
-	f.BoolVar(&l.RejectOldSamples, "validation.reject-old-samples", false, "Deprecated (use ingester.out-of-order-time-window instead): Reject old samples.")
+	f.BoolVar(&l.RejectOldSamples, "validation.reject-old-samples", false, "Reject old samples.")
 	_ = l.RejectOldSamplesMaxAge.Set("14d")
-	f.Var(&l.RejectOldSamplesMaxAge, "validation.reject-old-samples.max-age", "Deprecated (use ingester.out-of-order-time-window instead): Maximum accepted sample age before rejecting.")
+	f.Var(&l.RejectOldSamplesMaxAge, "validation.reject-old-samples.max-age", "Maximum accepted sample age before rejecting.")
 	_ = l.CreationGracePeriod.Set("10m")
 	f.Var(&l.CreationGracePeriod, "validation.create-grace-period", "Duration which table will be created/deleted before/after it's needed; we won't accept sample from before this time.")
 	f.BoolVar(&l.EnforceMetricName, "validation.enforce-metric-name", true, "Enforce every sample has a metric name.")