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.

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

store: avoid setting ratelimit action in tracker when disabled #31110

Merged
merged 35 commits into from Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
883ceda
skip setting
Yisaer Dec 29, 2021
a58a938
skip setting
Yisaer Dec 29, 2021
0f4f38c
Merge branch 'master' into revise_tracker_action
Yisaer Mar 25, 2022
dcc7d72
address the comment
Yisaer Mar 25, 2022
d38b10a
Merge branch 'master' into revise_tracker_action
Yisaer Mar 25, 2022
34fc5e3
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
91131a4
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
4283f3d
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
9ae71bf
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
fec08df
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
cb81c60
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 25, 2022
0e1568e
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 26, 2022
48bdb24
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 26, 2022
cac7627
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 26, 2022
75122d6
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 26, 2022
1f16d16
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
b5c1da9
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
089129c
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
b71449b
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
b7439d7
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
aeb44e4
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
1aba08d
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 27, 2022
2763a33
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
340bddb
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
a43f6e7
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
33d6fb6
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
1904a69
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
5814f90
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
cddb292
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
b08f5c2
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
c718e55
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
e94498a
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
7570c30
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
d57004c
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 28, 2022
12216a6
Merge branch 'master' into revise_tracker_action
ti-chi-bot Mar 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions session/session_test.go
Expand Up @@ -65,6 +65,7 @@ import (
newTestkit "github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util"
"github.com/pingcap/tidb/util/memory"
"github.com/pingcap/tidb/util/sqlexec"
"github.com/pingcap/tidb/util/testkit"
"github.com/pingcap/tidb/util/testleak"
Expand Down Expand Up @@ -3986,6 +3987,18 @@ func (s *testSessionSuite2) TestSetEnableRateLimitAction(c *C) {
// assert default value
result := tk.MustQuery("select @@tidb_enable_rate_limit_action;")
result.Check(testkit.Rows("1"))
tk.MustExec("use test")
tk.MustExec("create table tmp123(id int)")
tk.MustQuery("select * from tmp123;")
haveRateLimitAction := false
action := tk.Se.GetSessionVars().StmtCtx.MemTracker.GetFallbackForTest()
for ; action != nil; action = action.GetFallback() {
if action.GetPriority() == memory.DefRateLimitPriority {
haveRateLimitAction = true
break
}
}
c.Assert(haveRateLimitAction, IsTrue)

// assert set sys variable
tk.MustExec("set global tidb_enable_rate_limit_action= '0';")
Expand All @@ -3996,6 +4009,16 @@ func (s *testSessionSuite2) TestSetEnableRateLimitAction(c *C) {
tk.Se = se
result = tk.MustQuery("select @@tidb_enable_rate_limit_action;")
result.Check(testkit.Rows("0"))

haveRateLimitAction = false
action = tk.Se.GetSessionVars().StmtCtx.MemTracker.GetFallbackForTest()
for ; action != nil; action = action.GetFallback() {
if action.GetPriority() == memory.DefRateLimitPriority {
haveRateLimitAction = true
break
}
}
c.Assert(haveRateLimitAction, IsFalse)
}

func (s *testSessionSuite3) TestSetVarHint(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion store/copr/coprocessor.go
Expand Up @@ -133,7 +133,7 @@ func (c *CopClient) Send(ctx context.Context, req *kv.Request, variables interfa
it.sendRate = util.NewRateLimit(it.concurrency)
}
it.actionOnExceed = newRateLimitAction(uint(it.sendRate.GetCapacity()))
if sessionMemTracker != nil {
if sessionMemTracker != nil && enabledRateLimitAction {
sessionMemTracker.FallbackOldAndSetNewAction(it.actionOnExceed)
}

Expand Down