Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove field LimitOrigin in flow.Rule #233

Merged
merged 1 commit into from
Sep 8, 2020
Merged

Remove field LimitOrigin in flow.Rule #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions core/flow/rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@ import (
"fmt"
)

const (
// LimitOriginDefault represents all origins.
LimitOriginDefault = "default"
// LimitOriginOther represents all origins excluding those configured in other rules.
// For example, if resource "abc" has a rule whose limit origin is "originA",
// the "other" origin will represents all origins excluding "originA".
LimitOriginOther = "other"
)

// MetricType represents the target metric type.
type MetricType int32

Expand Down Expand Up @@ -50,19 +41,17 @@ type Rule struct {
ID uint64 `json:"id,omitempty"`

// Resource represents the resource name.
Resource string `json:"resource"`
// LimitOrigin represents the target origin (reserved field).
LimitOrigin string `json:"limitOrigin"`
MetricType MetricType `json:"metricType"`
Resource string `json:"resource"`
MetricType MetricType `json:"metricType"`
// Count represents the threshold.
Count float64 `json:"count"`
RelationStrategy RelationStrategy `json:"relationStrategy"`
ControlBehavior ControlBehavior `json:"controlBehavior"`
Count float64 `json:"count"`
ControlBehavior ControlBehavior `json:"controlBehavior"`

RefResource string `json:"refResource"`
MaxQueueingTimeMs uint32 `json:"maxQueueingTimeMs"`
WarmUpPeriodSec uint32 `json:"warmUpPeriodSec"`
WarmUpColdFactor uint32 `json:"warmUpColdFactor"`
RelationStrategy RelationStrategy `json:"relationStrategy"`
RefResource string `json:"refResource"`
MaxQueueingTimeMs uint32 `json:"maxQueueingTimeMs"`
WarmUpPeriodSec uint32 `json:"warmUpPeriodSec"`
WarmUpColdFactor uint32 `json:"warmUpColdFactor"`
}

func (f *Rule) String() string {
Expand Down
3 changes: 0 additions & 3 deletions core/flow/rule_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ func buildFlowMap(rules []*Rule) TrafficControllerMap {
logging.Warnf("Ignoring invalid flow rule: %v, reason: %s", rule, err.Error())
continue
}
if rule.LimitOrigin == "" {
rule.LimitOrigin = LimitOriginDefault
}
generator, supported := tcGenFuncMap[rule.ControlBehavior]
if !supported {
logging.Warnf("Ignoring the rule due to unsupported control behavior: %v", rule)
Expand Down
5 changes: 0 additions & 5 deletions ext/datasource/helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func TestFlowRulesJsonConverter(t *testing.T) {
assert.True(t, len(flowRules) == 3)
r1 := &flow.Rule{
Resource: "abc",
LimitOrigin: "default",
MetricType: flow.Concurrency,
Count: 100,
RelationStrategy: flow.Direct,
Expand All @@ -61,7 +60,6 @@ func TestFlowRulesJsonConverter(t *testing.T) {

r2 := &flow.Rule{
Resource: "abc",
LimitOrigin: "default",
MetricType: flow.QPS,
Count: 200,
RelationStrategy: flow.AssociatedResource,
Expand All @@ -74,7 +72,6 @@ func TestFlowRulesJsonConverter(t *testing.T) {

r3 := &flow.Rule{
Resource: "abc",
LimitOrigin: "default",
MetricType: flow.QPS,
Count: 300,
RelationStrategy: flow.Direct,
Expand All @@ -94,7 +91,6 @@ func TestFlowRulesUpdater(t *testing.T) {
{
ID: 0,
Resource: "abc",
LimitOrigin: "default",
MetricType: 0,
Count: 0,
RelationStrategy: 0,
Expand Down Expand Up @@ -127,7 +123,6 @@ func TestFlowRulesUpdater(t *testing.T) {
fw := flow.Rule{
ID: 0,
Resource: "aaaa",
LimitOrigin: "aaa",
MetricType: 0,
Count: 0,
RelationStrategy: 0,
Expand Down
3 changes: 0 additions & 3 deletions tests/testdata/extension/helper/FlowRule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
{
"resource": "abc",
"limitOrigin": "default",
"metricType": 0,
"count": 100.0,
"relationStrategy": 0,
Expand All @@ -12,7 +11,6 @@
},
{
"resource": "abc",
"limitOrigin": "default",
"metricType": 1,
"count": 200.0,
"relationStrategy": 1,
Expand All @@ -23,7 +21,6 @@
},
{
"resource": "abc",
"limitOrigin": "default",
"metricType": 1,
"count": 300.0,
"relationStrategy": 0,
Expand Down