From a2e21d61f8eba09bb9148a08a8e5db9f166442fe Mon Sep 17 00:00:00 2001 From: Alexander Weaver Date: Thu, 6 Jun 2024 16:15:01 -0500 Subject: [PATCH] Alerting: Remove dead `evalRunning` guard in rule routine (#88312) Remove dead guard --- pkg/services/ngalert/schedule/alert_rule.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/services/ngalert/schedule/alert_rule.go b/pkg/services/ngalert/schedule/alert_rule.go index 6ffedf58668..4c1a2cf3e00 100644 --- a/pkg/services/ngalert/schedule/alert_rule.go +++ b/pkg/services/ngalert/schedule/alert_rule.go @@ -217,7 +217,6 @@ func (a *alertRule) Run(key ngmodels.AlertRuleKey) error { logger := a.logger.FromContext(grafanaCtx) logger.Debug("Alert rule routine started") - evalRunning := false var currentFingerprint fingerprint defer a.stopApplied(key) for { @@ -239,19 +238,14 @@ func (a *alertRule) Run(key ngmodels.AlertRuleKey) error { logger.Debug("Evaluation channel has been closed. Exiting") return nil } - if evalRunning { - continue - } func() { orgID := fmt.Sprint(key.OrgID) evalDuration := a.metrics.EvalDuration.WithLabelValues(orgID) evalTotal := a.metrics.EvalTotal.WithLabelValues(orgID) - evalRunning = true evalStart := a.clock.Now() defer func() { - evalRunning = false a.evalApplied(key, ctx.scheduledAt) evalDuration.Observe(a.clock.Now().Sub(evalStart).Seconds()) }()