Skip to content

Commit 9524fba

Browse files
authored
Revert "Reduce likelihood of a race between rules evaluation and alerts scheduling. (#484)" (#614)
No longer needed after 3281b7d which fixed the problem this was working around. This reverts commit 5e2c7f7.
1 parent 8cb5a04 commit 9524fba

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

pkg/ruler/ruler.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,9 +286,7 @@ func NewServer(cfg Config, ruler *Ruler) (*Server, error) {
286286
Timeout: cfg.ClientTimeout,
287287
}
288288
// TODO: Separate configuration for polling interval.
289-
// N.B.: there is currently a race condition between rules evaluation and alerts scheduling,
290-
// so we offset the interval, but only by a small amount, to minimise the odds of the race happening.
291-
s := newScheduler(c, cfg.EvaluationInterval, cfg.EvaluationInterval+10*time.Millisecond)
289+
s := newScheduler(c, cfg.EvaluationInterval, cfg.EvaluationInterval)
292290
if cfg.NumWorkers <= 0 {
293291
return nil, fmt.Errorf("must have at least 1 worker, got %d", cfg.NumWorkers)
294292
}

0 commit comments

Comments
 (0)