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 potential goroutine leak when kill connection #13051

Merged
merged 5 commits into from
Nov 1, 2019
Merged

server: fix potential goroutine leak when kill connection #13051

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5aba7e2
fix potential goroutine leak when kill connection
SunRunAway Oct 31, 2019
0a97249
fix test
SunRunAway Oct 31, 2019
023c6a9
Merge branch 'master' into conn
tiancaiamao Nov 1, 2019
f0e0508
Merge branch 'master' into conn
sre-bot Nov 1, 2019
48b9dc4
Merge branch 'master' into conn
SunRunAway Nov 1, 2019
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
16 changes: 9 additions & 7 deletions server/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,21 +1143,23 @@ func (cc *clientConn) handleLoadStats(ctx context.Context, loadStatsInfo *execut
// There is a special query `load data` that does not return result, which is handled differently.
// Query `load stats` does not return result either.
func (cc *clientConn) handleQuery(ctx context.Context, sql string) (err error) {
rs, err := cc.ctx.Execute(ctx, sql)
rss, err := cc.ctx.Execute(ctx, sql)
if err != nil {
metrics.ExecuteErrorCounter.WithLabelValues(metrics.ExecuteErrorToLabel(err)).Inc()
return err
}
status := atomic.LoadInt32(&cc.status)
if rs != nil && (status == connStatusShutdown || status == connStatusWaitShutdown) {
killConn(cc)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here it need not to killConn again

if rss != nil && (status == connStatusShutdown || status == connStatusWaitShutdown) {
for _, rs := range rss {
terror.Call(rs.Close)
}
return executor.ErrQueryInterrupted
}
if rs != nil {
if len(rs) == 1 {
err = cc.writeResultset(ctx, rs[0], false, 0, 0)
if rss != nil {
if len(rss) == 1 {
err = cc.writeResultset(ctx, rss[0], false, 0, 0)
} else {
err = cc.writeMultiResultset(ctx, rs, false)
err = cc.writeMultiResultset(ctx, rss, false)
}
} else {
loadDataInfo := cc.ctx.Value(executor.LoadDataVarKey)
Expand Down