Skip to content

*: enable memory arbitrator by default #69638

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

Open
solotzg wants to merge 6 commits into
base: master
Choose a base branch
from
+5 −7
Open

*: enable memory arbitrator by default #69638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d51ebae
vars: update memory arbitrator mode to priority
solotzg Jul 3, 2026
979a8c3
executor: update global memory arbitrator mode tests for accuracy
solotzg Jul 3, 2026
2250585
util/memory: reset global arbitrator mode in tests
solotzg Jul 3, 2026
827f8f4
util/memory: avoid resetting arbitrator mode in test setup
solotzg Jul 3, 2026
3ba3ba6
planner: add rule_max_min_eliminate_test and update test dependencies
solotzg Jul 3, 2026
3c80a17
Merge remote-tracking branch 'pingcap/master' into def-use-arbitrate
solotzg Jul 3, 2026
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
10 changes: 4 additions & 6 deletions pkg/executor/test/memtest/mem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ func TestGlobalMemArbitrator(t *testing.T) {

tk.MustExecToErr("set @@tidb_mem_arbitrator_mode = standard") // only global
require.Equal(t, tk.ExecToErr("set global tidb_mem_arbitrator_mode = 1").Error(), "tidb_mem_arbitrator_mode: disable; standard; priority;")
require.Equal(t, memory.ArbitratorModeDisable, memory.GlobalMemArbitrator().WorkMode())
require.True(t, memory.GlobalMemArbitrator() == nil)
tk.MustQuery("select @@tidb_mem_arbitrator_mode").Check(testkit.Rows("priority"))

tk.MustExec("set global tidb_mem_arbitrator_mode = standard")
tk.MustQuery("select @@tidb_mem_arbitrator_mode").Check(testkit.Rows("standard"))
Expand All @@ -68,20 +67,19 @@ func TestGlobalMemArbitrator(t *testing.T) {
require.Equal(t, memory.ArbitratorModePriority, memory.GlobalMemArbitrator().WorkMode())

tk.MustExec("set global tidb_mem_arbitrator_mode = default")
tk.MustQuery("select @@tidb_mem_arbitrator_mode").Check(testkit.Rows("disable"))
require.Equal(t, memory.ArbitratorModeDisable, memory.GlobalMemArbitrator().WorkMode())
tk.MustQuery("select @@tidb_mem_arbitrator_mode").Check(testkit.Rows("priority"))

const maxServerLimit uint64 = 1e15
maxServerLimitStr := fmt.Sprintf("%d", maxServerLimit)
tk.MustExec(fmt.Sprintf("set global tidb_server_memory_limit=%d", maxServerLimit))
tk.MustQuery("select @@tidb_server_memory_limit").Check(testkit.Rows(maxServerLimitStr))
require.Equal(t, maxServerLimit, memory.ServerMemoryLimit.Load())
require.Equal(t, uint64(0), memory.GlobalMemArbitrator().Limit()) // 0 under disable mode
require.Equal(t, maxServerLimit, memory.GlobalMemArbitrator().Limit())

require.Equal(t, tk.ExecToErr("set global tidb_mem_arbitrator_soft_limit=-1").Error(), "tidb_mem_arbitrator_soft_limit: 0 (default); (0, 1.0] float-rate * server-limit; (1, server-limit] integer bytes; auto;")
tk.MustExec("set global tidb_mem_arbitrator_soft_limit = 12345678")
tk.MustQuery("select @@tidb_mem_arbitrator_soft_limit").Check(testkit.Rows("12345678"))
require.Equal(t, uint64(0), memory.GlobalMemArbitrator().SoftLimit()) // 0 under disable mode
require.Equal(t, uint64(12345678), memory.GlobalMemArbitrator().SoftLimit())

// normal under standard mode
tk.MustExec("set global tidb_mem_arbitrator_mode = standard")
Expand Down
2 changes: 1 addition & 1 deletion pkg/sessionctx/vardef/tidb_vars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ const (
DefTiDBEnableBindingUsage = true
DefTiDBAdvancerCheckPointLagLimit = 48 * time.Hour
DefTiDBMemArbitratorSoftLimitText = memory.ArbitratorSoftLimitModDisableName
DefTiDBMemArbitratorModeText = memory.ArbitratorModeDisableName
DefTiDBMemArbitratorModeText = memory.ArbitratorModePriorityName
DefTiDBMemArbitratorQueryReservedText = "0"
DefTiDBMemArbitratorWaitAverse = "0"
DefTiDBIndexLookUpPushDownPolicy = IndexLookUpPushDownPolicyHintOnly
Expand Down
Loading