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

server: fix show problem for kill tidb connection (#24031) #29212

Merged
merged 11 commits into from
Nov 12, 2021
Merged

server: fix show problem for kill tidb connection (#24031) #29212

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c5142a3
server: explicit show kill status in process list info (#24031)
yiwen92 Oct 28, 2021
bfac1cf
Merge branch 'master' into issue24031
yiwen92 Oct 28, 2021
5356af9
server: explicit show kill status in process list state
yiwen92 Nov 5, 2021
6973306
Merge branch 'master' into issue24031
yiwen92 Nov 5, 2021
3f3d802
server: fix show problem for kill tidb connection
yiwen92 Nov 8, 2021
f4d4bad
server: fix show problem for kill tidb connection
yiwen92 Nov 8, 2021
011132e
Merge branch 'issue24031' of github.com:yiwen92/tidb into issue24031
yiwen92 Nov 8, 2021
7b0eecf
Merge branch 'pingcap:master' into issue24031
yiwen92 Nov 8, 2021
d5ef925
Merge branch 'master' into issue24031
ti-chi-bot Nov 12, 2021
e65ff09
Merge branch 'master' into issue24031
ti-chi-bot Nov 12, 2021
878b7f5
Merge branch 'master' into issue24031
ti-chi-bot Nov 12, 2021
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
2 changes: 2 additions & 0 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,8 @@ func (s *Server) getTLSConfig() *tls.Config {
func killConn(conn *clientConn) {
sessVars := conn.ctx.GetSessionVars()
atomic.StoreUint32(&sessVars.Killed, 1)
// 'Kill' status can be showed in Command/Info field when show processlist
conn.ctx.SetProcessInfo("this session is being killed", time.Now(), mysql.ComProcessKill, 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally, for MySQL compatibility the Info column is not overwritten. This helps you see what is being actively killed. The State should also say "Killed" instead of autocommit.

For #24031, there are really two issues:

  1. Update the status for connections which have been "killed" so that it is more accurate.
  2. Change the wait_timeout to be a loop, so the connection which is being killed can cleanup faster.

This fixes issue (1), but we should also fix (2) to consider #24031 resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx for your review, and do we need design doc for fix (2)?

conn.mu.RLock()
cancelFunc := conn.mu.cancelFunc
conn.mu.RUnlock()
Expand Down