Add cache mechanism for LoadRules in hotspot module (#321)

binbin0325 · web-flow · commit 1fed42d50f18 · 2020-11-16T20:54:06.000+08:00
diff --git a/core/hotspot/rule_manager.go b/core/hotspot/rule_manager.go
@@ -2,6 +2,7 @@ package hotspot
 
 import (
 	"fmt"
+	"reflect"
 	"sync"
 
 	"github.com/alibaba/sentinel-golang/core/misc"
@@ -20,6 +21,7 @@ var (
 	tcGenFuncMap = make(map[ControlBehavior]TrafficControllerGenFunc, 4)
 	tcMap        = make(trafficControllerMap)
 	tcMux        = new(sync.RWMutex)
+	currentRules = make([]*Rule, 0)
 )
 
 func init() {
@@ -70,6 +72,14 @@ func getTrafficControllersFor(res string) []TrafficShapingController {
 // bool: indicates whether the internal map has been changed;
 // error: indicates whether occurs the error.
 func LoadRules(rules []*Rule) (bool, error) {
+	tcMux.RLock()
+	isEqual := reflect.DeepEqual(currentRules, rules)
+	tcMux.RUnlock()
+	if isEqual {
+		logging.Info("[HotSpot] Load rules repetition, does not load")
+		return false, nil
+	}
+
 	err := onRuleUpdate(rules)
 	return true, err
 }
@@ -210,6 +220,7 @@ func onRuleUpdate(rules []*Rule) (err error) {
 		}
 	}
 	tcMap = m
+	currentRules = rules
 
 	return nil
 }
diff --git a/core/hotspot/rule_manager_test.go b/core/hotspot/rule_manager_test.go
@@ -279,3 +279,43 @@ func Test_onRuleUpdate(t *testing.T) {
 
 	tcMap = make(trafficControllerMap)
 }
+
+func TestLoadRules(t *testing.T) {
+	t.Run("loadSameRules", func(t *testing.T) {
+		specific := make(map[interface{}]int64)
+		specific["sss"] = 1
+		specific["123"] = 3
+
+		_, err := LoadRules([]*Rule{
+			{
+				ID:                "1",
+				Resource:          "abc",
+				MetricType:        Concurrency,
+				ControlBehavior:   Reject,
+				ParamIndex:        0,
+				Threshold:         100.0,
+				MaxQueueingTimeMs: 0,
+				BurstCount:        10,
+				DurationInSec:     1,
+				SpecificItems:     specific,
+			},
+		})
+		assert.Nil(t, err)
+		ok, err := LoadRules([]*Rule{
+			{
+				ID:                "1",
+				Resource:          "abc",
+				MetricType:        Concurrency,
+				ControlBehavior:   Reject,
+				ParamIndex:        0,
+				Threshold:         100.0,
+				MaxQueueingTimeMs: 0,
+				BurstCount:        10,
+				DurationInSec:     1,
+				SpecificItems:     specific,
+			},
+		})
+		assert.Nil(t, err)
+		assert.False(t, ok)
+	})
+}
diff --git a/ext/datasource/helper.go b/ext/datasource/helper.go
@@ -203,8 +203,8 @@ func HotSpotParamRulesUpdater(data interface{}) error {
 			fmt.Sprintf("Fail to type assert data to []hotspot.Rule or []*hotspot.Rule, in fact, data: %+v", data),
 		)
 	}
-	succ, err := hotspot.LoadRules(rules)
-	if succ && err == nil {
+	_, err := hotspot.LoadRules(rules)
+	if err == nil {
 		return nil
 	}
 	return NewError(

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ func HotSpotParamRulesUpdater(data interface{}) error {`
`203`	`203`	`fmt.Sprintf("Fail to type assert data to []hotspot.Rule or []*hotspot.Rule, in fact, data: %+v", data),`
`204`	`204`	`)`
`205`	`205`	`}`
`206`		`- succ, err := hotspot.LoadRules(rules)`
`207`		`- if succ && err == nil {`
	`206`	`+ _, err := hotspot.LoadRules(rules)`
	`207`	`+ if err == nil {`
`208`	`208`	`return nil`
`209`	`209`	`}`
`210`	`210`	`return NewError(`