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

server: fix kill query incorrectly killing idle connections (#65464)

Browse Source 
close pingcap/tidb#65447
This commit is contained in:
Liqi Geng
2026-01-08 22:00:32 +08:00
committed by GitHub
parent 03713e7496
commit 579d0c569d
3 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/server/server.go
View File

@ -990,6 +990,9 @@ func (s *Server) Kill(connectionID uint64, query bool, maxExecutionTime bool, ru
if err := conn.bufReadConn.SetWriteDeadline(time.Now()); err != nil {
logutil.BgLogger().Warn("error setting write deadline for kill.", zap.Error(err))
}
if err := conn.bufReadConn.SetReadDeadline(time.Now()); err != nil {
logutil.BgLogger().Warn("error setting read deadline for kill.", zap.Error(err))
}
}
}
killQuery(conn, maxExecutionTime, runaway)
@ -1021,11 +1024,6 @@ func killQuery(conn *clientConn, maxExecutionTime, runaway bool) {
if cancelFunc != nil {
cancelFunc()
}
if conn.bufReadConn != nil {
if err := conn.bufReadConn.SetReadDeadline(time.Now()); err != nil {
logutil.BgLogger().Warn("error setting read deadline for kill.", zap.Error(err))
}
}
sessVars.SQLKiller.FinishResultSet()
}
@ -1052,6 +1050,11 @@ func (s *Server) KillAllConnections() {
if err := conn.closeWithoutLock(); err != nil {
terror.Log(err)
}
if conn.bufReadConn != nil {
if err := conn.bufReadConn.SetReadDeadline(time.Now()); err != nil {
logutil.BgLogger().Warn("error setting read deadline for kill.", zap.Error(err))
}
}
killQuery(conn, false, false)
}

2
tests/globalkilltest/BUILD.bazel
View File

@ -9,7 +9,7 @@ go_test(
],
embed = [":globalkilltest"],
flaky = True,
shard_count = 10,
shard_count = 11,
deps = [
"//pkg/testkit/testsetup",
"//pkg/util/logutil",

52
tests/globalkilltest/global_kill_test.go
View File

@ -840,3 +840,55 @@ func TestConnIDUpgradeAndDowngrade(t *testing.T) {
conn.mustBe32(t)
conn.Close()
}
func TestKillQueryOnIdleConnection(t *testing.T) {
s := createGlobalKillSuite(t, true)
require.NoErrorf(t, s.pdErr, msgErrConnectPD, s.pdErr)
// tidb1 & conn1a,conn1b
port1 := *tidbStartPort + 1
tidb1, err := s.startTiDBWithPD(port1, *tidbStatusPort+1, *pdClientPath)
require.NoError(t, err)
defer s.stopService("tidb1", tidb1, true)
db1, err := s.connectTiDB(port1)
require.NoError(t, err)
defer db1.Close()
db2, err := s.connectTiDB(port1)
require.NoError(t, err)
defer db2.Close()
ctx := context.TODO()
conn1, err := db1.Conn(ctx)
require.NoError(t, err)
defer conn1.Close()
var connID1 uint64
err = conn1.QueryRowContext(ctx, "SELECT CONNECTION_ID();").Scan(&connID1)
require.NoError(t, err)
conn2, err := db2.Conn(ctx)
require.NoError(t, err)
defer conn2.Close()
rows, err := conn1.QueryContext(ctx, "select 1")
require.NoError(t, err)
require.True(t, rows.Next())
require.NoError(t, rows.Err())
require.NoError(t, rows.Close())
_, err = conn2.ExecContext(ctx, fmt.Sprintf("KILL QUERY %v", connID1))
require.NoError(t, err)
// verify connection is still alive
rows, err = conn1.QueryContext(ctx, "select 1")
require.NoError(t, err)
require.True(t, rows.Next())
require.NoError(t, rows.Err())
require.NoError(t, rows.Close())
_, err = conn2.ExecContext(ctx, fmt.Sprintf("KILL CONNECTION %v", connID1))
require.NoError(t, err)
// verify connection is closed
_, err = conn1.ExecContext(ctx, "select 1")
require.Error(t, err)
}