From 0c97afadbc9e69f1f27229498f9d4962a7f18198 Mon Sep 17 00:00:00 2001 From: Owen Diehl Date: Fri, 29 Oct 2021 12:41:11 -0400 Subject: [PATCH] cleans up redundant setting of stream.unorderedWrites=true when replaying wal (#4595) --- pkg/ingester/limiter.go | 1 + pkg/ingester/recovery.go | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/ingester/limiter.go b/pkg/ingester/limiter.go index fea7f856ae3e..375e4802e2ba 100644 --- 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 index 3e48929fdddf..3243dd2ae0a7 100644 --- 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