Precompute overrides at loadOverrides time

Author: jprenken

ratelimits/limit.go

@@ -258,7 +258,6 @@ func parseOverrideLimits(newOverridesYAML overridesYAML) (Limits, error) {
 					Comment:    entry.Comment,
 					isOverride: true,
 				}
-				lim.precompute()
 
 				err = ValidateLimit(lim)
 				if err != nil {
@@ -402,13 +401,14 @@ func (l *limitRegistry) loadOverrides(ctx context.Context) error {
 		return nil
 	}
 
-	l.overrides = newOverrides
-
-	l.overridesTimestamp.SetToCurrentTime()
 	newOverridesPerLimit := make(map[Name]float64)
 	for _, override := range newOverrides {
+		override.precompute()
 		newOverridesPerLimit[override.Name]++
 	}
+
+	l.overrides = newOverrides
+	l.overridesTimestamp.SetToCurrentTime()
 	for rlName, rlString := range nameToString {
 		l.overridesPerLimit.WithLabelValues(rlString).Set(newOverridesPerLimit[rlName])
 	}

ratelimits/limit_test.go

@@ -262,6 +262,9 @@ func TestLoadOverrides(t *testing.T) {
 	test.AssertNotError(t, err, "loading overrides from file")
 	testOverrides, err := parseOverrideLimits(overridesData)
 	test.AssertNotError(t, err, "parsing overrides")
+	for _, override := range testOverrides {
+		override.precompute()
+	}
 
 	test.AssertDeepEquals(t, tb.limitRegistry.overrides, testOverrides)
 

ratelimits/transaction.go

@@ -213,7 +213,6 @@ func NewTransactionBuilderFromDatabase(defaults string, overrides GetOverridesFu
 				continue
 			}
 
-			newLimit.precompute()
 			overrides[bucketKey] = newLimit
 		}
 		errorGauge.Set(errorCount)