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

Jump to bottom

executor: fix some bug for global memory control #38798

Merged
merged 5 commits into from
Nov 2, 2022
Merged

executor: fix some bug for global memory control #38798

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7718c0
fix
wshwsh12 Nov 1, 2022
fb5ffb3
fix
wshwsh12 Nov 1, 2022
5a398be
Merge branch 'master' into memory-control-bug-fix
wshwsh12 Nov 2, 2022
8fabb3f
Merge branch 'master' into memory-control-bug-fix
ti-chi-bot Nov 2, 2022
f046579
Merge branch 'master' into memory-control-bug-fix
ti-chi-bot Nov 2, 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
9 changes: 6 additions & 3 deletions util/servermemorylimit/servermemorylimit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ func (smqh *Handle) Run() {
}

type sessionToBeKilled struct {
isKilling bool
sqlStartTime time.Time
sessionID uint64
isKilling bool
sqlStartTime time.Time
sessionID uint64
sessionTracker *memory.Tracker
}

func killSessIfNeeded(s *sessionToBeKilled, bt uint64, sm util.SessionManager) {
Expand All @@ -91,6 +92,7 @@ func killSessIfNeeded(s *sessionToBeKilled, bt uint64, sm util.SessionManager) {
}
s.isKilling = false
IsKilling.Store(false)
memory.MemUsageTop1Tracker.CompareAndSwap(s.sessionTracker, nil)
//nolint: all_revive,revive
runtime.GC()
}
Expand All @@ -109,6 +111,7 @@ func killSessIfNeeded(s *sessionToBeKilled, bt uint64, sm util.SessionManager) {
s.sessionID = t.SessionID
s.sqlStartTime = info.Time
s.isKilling = true
s.sessionTracker = t
t.NeedKill.Store(true)

killTime := time.Now()
Expand Down