Remove caching of rate limit overrides

envoyproxy · Jul 14, 2020 · 1d56d6a · 1d56d6a
1 parent 9f2cbf7
commit 1d56d6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/src/config/config_impl.go b/src/config/config_impl.go
@@ -36,7 +36,6 @@ type rateLimitDescriptor struct {
 
 type rateLimitDomain struct {
 	rateLimitDescriptor
-	overrides map[string]*RateLimit
 }
 
 type rateLimitConfigImpl struct {
@@ -228,7 +227,7 @@ func (this *rateLimitConfigImpl) loadConfig(config RateLimitConfigToLoad) {
 	}
 
 	logger.Debugf("loading domain: %s", root.Domain)
-	newDomain := &rateLimitDomain{rateLimitDescriptor{map[string]*rateLimitDescriptor{}, nil}, map[string]*RateLimit{}}
+	newDomain := &rateLimitDomain{rateLimitDescriptor{map[string]*rateLimitDescriptor{}, nil}}
 	newDomain.loadDescriptors(config, root.Domain+".", root.Descriptors, this.statsScope)
 	this.domains[root.Domain] = newDomain
 }
@@ -269,23 +268,12 @@ func (this *rateLimitConfigImpl) GetLimit(
 
 	if descriptor.GetLimit() != nil {
 		rateLimitKey := domain + "." + this.descriptorToKey(descriptor)
-		rateLimit := value.overrides[rateLimitKey]
 		rateLimitOverrideUnit := pb.RateLimitResponse_RateLimit_Unit(descriptor.GetLimit().GetUnit())
-		if rateLimit != nil {
-			if rateLimit.Limit.RequestsPerUnit != descriptor.GetLimit().GetRequestsPerUnit() ||
-				rateLimit.Limit.Unit != rateLimitOverrideUnit {
-
-				rateLimit.Limit.RequestsPerUnit = descriptor.GetLimit().GetRequestsPerUnit()
-				rateLimit.Limit.Unit = rateLimitOverrideUnit
-			}
-			return rateLimit
-		}
 		rateLimit = NewRateLimit(
 			descriptor.GetLimit().GetRequestsPerUnit(),
 			rateLimitOverrideUnit,
 			rateLimitKey,
 			this.statsScope)
-		value.overrides[rateLimitKey] = rateLimit
 		return rateLimit
 	}
 

diff --git a/test/config/config_test.go b/test/config/config_test.go
@@ -193,13 +193,16 @@ func TestConfigLimitOverride(t *testing.T) {
 			},
 		})
 	assert.Equal("test-domain.key1_value1.subkey1_something", rl.FullKey)
+	rl.Stats.TotalHits.Inc()
+	rl.Stats.OverLimit.Inc()
+	rl.Stats.NearLimit.Inc()
 	common.AssertProtoEqual(assert, &pb.RateLimitResponse_RateLimit{
 		RequestsPerUnit: 42,
 		Unit:            pb.RateLimitResponse_RateLimit_HOUR,
 	}, rl.Limit)
-	assert.EqualValues(1, stats.NewCounter("test-domain.key1_value1.subkey1_something.total_hits").Value())
-	assert.EqualValues(1, stats.NewCounter("test-domain.key1_value1.subkey1_something.over_limit").Value())
-	assert.EqualValues(1, stats.NewCounter("test-domain.key1_value1.subkey1_something.near_limit").Value())
+	assert.EqualValues(2, stats.NewCounter("test-domain.key1_value1.subkey1_something.total_hits").Value())
+	assert.EqualValues(2, stats.NewCounter("test-domain.key1_value1.subkey1_something.over_limit").Value())
+	assert.EqualValues(2, stats.NewCounter("test-domain.key1_value1.subkey1_something.near_limit").Value())
 
 	// Different value creates a different counter
 	rl = rlConfig.GetLimit(