cleans up redundant setting of stream.unorderedWrites=true when repla…

…ying wal (#4595)
grafana · Oct 29, 2021 · 0c97afa · 0c97afa
1 parent 633b4ca
commit 0c97afa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pkg/ingester/limiter.go b/pkg/ingester/limiter.go
@@ -60,6 +60,7 @@ func NewLimiter(limits *validation.Overrides, metrics *ingesterMetrics, ring Rin
 func (l *Limiter) UnorderedWrites(userID string) bool {
 	// WAL replay should not discard previously ack'd writes,
 	// so allow out of order writes while the limiter is disabled.
+	// This allows replaying unordered WALs into ordered configurations.
 	if l.disabled {
 		return true
 	}

diff --git a/pkg/ingester/recovery.go b/pkg/ingester/recovery.go
@@ -128,9 +128,6 @@ func (r *ingesterRecoverer) Series(series *Series) error {
 		stream.lastLine.content = series.LastLine
 		stream.entryCt = series.EntryCt
 		stream.highestTs = series.HighestTs
-		// Always set during replay, then reset to desired value afterward.
-		// This allows replaying unordered WALs into ordered configurations.
-		stream.unorderedWrites = true
 
 		if err != nil {
 			return err