Update the cache before updating the rule manager

damnever · damnever · commit e4d28237ab9a · 2024-11-29T10:21:50.000+08:00
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
diff --git a/pkg/ruler/manager.go b/pkg/ruler/manager.go
@@ -211,7 +211,7 @@ func (r *DefaultMultiTenantManager) syncRulesToManager(ctx context.Context, user
 	if !existing || rulesUpdated || externalLabelsUpdated {
 		level.Debug(r.logger).Log("msg", "updating rules", "user", user)
 		r.configUpdatesTotal.WithLabelValues(user).Inc()
-		if rulesUpdated && existing {
+		if (rulesUpdated || externalLabelsUpdated) && existing {
 			r.updateRuleCache(user, manager.RuleGroups())
 		}
 		err = manager.Update(r.cfg.EvaluationInterval, files, externalLabels, r.cfg.ExternalURL.String(), ruleGroupIterationFunc)

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ func (r *DefaultMultiTenantManager) syncRulesToManager(ctx context.Context, user`
`211`	`211`	`if !existing \|\| rulesUpdated \|\| externalLabelsUpdated {`
`212`	`212`	`level.Debug(r.logger).Log("msg", "updating rules", "user", user)`
`213`	`213`	`r.configUpdatesTotal.WithLabelValues(user).Inc()`
`214`		`- if rulesUpdated && existing {`
	`214`	`+ if (rulesUpdated \|\| externalLabelsUpdated) && existing {`
`215`	`215`	`r.updateRuleCache(user, manager.RuleGroups())`
`216`	`216`	`}`
`217`	`217`	`err = manager.Update(r.cfg.EvaluationInterval, files, externalLabels, r.cfg.ExternalURL.String(), ruleGroupIterationFunc)`