diff --git a/core/circuitbreaker/rule.go b/core/circuitbreaker/rule.go index ed3773e2..0886604b 100644 --- a/core/circuitbreaker/rule.go +++ b/core/circuitbreaker/rule.go @@ -61,7 +61,7 @@ type Rule struct { // that can trigger circuit breaking. MinRequestAmount uint64 `json:"minRequestAmount"` // StatIntervalMs represents statistic time interval of the internal circuit breaker (in ms). - // Currently, the statistic interval is collected by sliding window. + // Currently the statistic interval is collected by sliding window. StatIntervalMs uint32 `json:"statIntervalMs"` // StatSlidingWindowBucketCount represents the bucket count of statistic sliding window. // The statistic will be more precise as the bucket count increases, but the memory cost increases too. @@ -78,10 +78,10 @@ type Rule struct { // for ErrorRatio, it represents the max error request ratio // for ErrorCount, it represents the max error request count Threshold float64 `json:"threshold"` - // ProbeNum is number of probes required when the circuit breaker is half-open. - // when the probe num are set and circuit breaker in the half-open state. - // if err occurs during the probe, the circuit breaker is opened immediately. - // otherwise,the circuit breaker is closed only after the number of probes is reached + //ProbeNum is number of probes required when the circuit breaker is half-open. + //when the probe num are set and circuit breaker in the half-open state. + //if err occurs during the probe, the circuit breaker is opened immediately. + //otherwise,the circuit breaker is closed only after the number of probes is reached ProbeNum uint64 `json:"probeNum"` } @@ -103,14 +103,12 @@ func (r *Rule) ResourceName() string { return r.Resource } -// Check whether the fields shared by all rule strategy types are consistent func (r *Rule) isEqualsToBase(newRule *Rule) bool { if newRule == nil { return false } return r.Resource == newRule.Resource && r.Strategy == newRule.Strategy && r.RetryTimeoutMs == newRule.RetryTimeoutMs && - r.MinRequestAmount == newRule.MinRequestAmount && r.StatIntervalMs == newRule.StatIntervalMs && r.StatSlidingWindowBucketCount == newRule.StatSlidingWindowBucketCount && - r.ProbeNum == newRule.ProbeNum + r.MinRequestAmount == newRule.MinRequestAmount && r.StatIntervalMs == newRule.StatIntervalMs && r.StatSlidingWindowBucketCount == newRule.StatSlidingWindowBucketCount } func (r *Rule) isEqualsTo(newRule *Rule) bool { diff --git a/core/circuitbreaker/rule_test.go b/core/circuitbreaker/rule_test.go index 7f34b4e9..604ed267 100644 --- a/core/circuitbreaker/rule_test.go +++ b/core/circuitbreaker/rule_test.go @@ -368,30 +368,6 @@ func TestRuleIsEqualsToBase(t *testing.T) { }, expectedResult: false, }, - // different ProbeNum - { - rule1: &Rule{ - Resource: "abc", - Strategy: ErrorCount, - RetryTimeoutMs: 3000, - MinRequestAmount: 10, - StatIntervalMs: 10000, - StatSlidingWindowBucketCount: 2, - Threshold: 1.0, - ProbeNum: 10, - }, - rule2: &Rule{ - Resource: "abc", - Strategy: ErrorCount, - RetryTimeoutMs: 3000, - MinRequestAmount: 10, - StatIntervalMs: 10000, - StatSlidingWindowBucketCount: 2, - Threshold: 1.0, - ProbeNum: 11, - }, - expectedResult: false, - }, } for i, c := range cases { diff --git a/core/hotspot/rule.go b/core/hotspot/rule.go index b46f5fdf..67854104 100644 --- a/core/hotspot/rule.go +++ b/core/hotspot/rule.go @@ -76,7 +76,7 @@ type Rule struct { // ControlBehavior only takes effect when MetricType is QPS ControlBehavior ControlBehavior `json:"controlBehavior"` // ParamIndex is the index in context arguments slice. - // if ParamIndex is greater than or equals to zero, ParamIndex means the -th parameter + // if ParamIndex is great than or equals to zero, ParamIndex means the -th parameter // if ParamIndex is the negative, ParamIndex means the reversed -th parameter ParamIndex int `json:"paramIndex"` // ParamKey is the key in EntryContext.Input.Attachments map.