database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

executor: fix flaky test TestMemTracker4InsertAndReplaceExec (#65313)

Browse Source 
close pingcap/tidb#65220
This commit is contained in:
xzhangxian1008
2025-12-31 18:12:24 +08:00
committed by GitHub
parent f5e23eb3f2
commit 648ef46cf3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/executor/test/oomtest/oom_test.go
View File

@ -96,6 +96,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
require.Equal(t, "", oom.GetTracker())
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
tk.Session().GetSessionVars().MemQuotaQuery = 1
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@ -111,6 +112,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec select * from t")
require.Equal(t, "", oom.GetTracker())
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
tk.Session().GetSessionVars().MemQuotaQuery = 1
tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec select * from t")
@ -122,6 +124,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec select * from t")
require.Equal(t, "", oom.GetTracker())
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
tk.Session().GetSessionVars().MemQuotaQuery = 1
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec select * from t")
@ -136,6 +139,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
require.Equal(t, "", oom.GetTracker())
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
tk.Session().GetSessionVars().MemQuotaQuery = 1
tk.MustExec("insert into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@ -149,6 +153,7 @@ func TestMemTracker4InsertAndReplaceExec(t *testing.T) {
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
require.Equal(t, "", oom.GetTracker())
oom.ClearMessageFilter()
oom.AddMessageFilter("expensive_query during bootstrap phase")
tk.Session().GetSessionVars().MemQuotaQuery = 1
tk.MustExec("replace into t_MemTracker4InsertAndReplaceExec values (1,1,1), (2,2,2), (3,3,3)")
@ -269,7 +274,7 @@ func (h *oomCapture) Write(entry zapcore.Entry, fields []zapcore.Field) error {
h.mu.Lock()
defer h.mu.Unlock()
// They are just common background task and not related to the oom.
if !h.messageFilter.Empty() && !h.messageFilter.Exist(entry.Message) {
if !h.messageFilter.Exist(entry.Message) {
return nil
}
h.tracker = entry.Message