Skip to content

Remove the work-around for a race condition #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2017
Merged

Remove the work-around for a race condition #614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkg/ruler/ruler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,7 @@ func NewServer(cfg Config, ruler *Ruler) (*Server, error) {
Timeout: cfg.ClientTimeout,
}
// TODO: Separate configuration for polling interval.
// N.B.: there is currently a race condition between rules evaluation and alerts scheduling,
// so we offset the interval, but only by a small amount, to minimise the odds of the race happening.
s := newScheduler(c, cfg.EvaluationInterval, cfg.EvaluationInterval+10*time.Millisecond)
s := newScheduler(c, cfg.EvaluationInterval, cfg.EvaluationInterval)
if cfg.NumWorkers <= 0 {
return nil, fmt.Errorf("must have at least 1 worker, got %d", cfg.NumWorkers)
}
Expand Down