conn: fix lost connection when insert from select panic cause by out of memory quota #12090
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@zz-jason @tiancaiamao PTAL |
Codecov Report
@@ Coverage Diff @@
## master #12090 +/- ##
===========================================
Coverage 81.6432% 81.6432%
===========================================
Files 449 449
Lines 96624 96624
===========================================
Hits 78887 78887
Misses 12169 12169
Partials 5568 5568 |
lonng
reviewed
Sep 9, 2019
session/session.go
Outdated
| buf := make([]byte, 4096) | ||
| stackSize := runtime.Stack(buf, false) | ||
| buf = buf[:stackSize] | ||
| logutil.Logger(ctx).Error("execute sql panic", zap.String("sql", sql), zap.String("stack", string(buf))) |
There was a problem hiding this comment.
Prefer using zap.Stack() directly.
lonng
previously approved these changes
Sep 9, 2019
zz-jason
reviewed
Sep 9, 2019
session/session.go
Outdated
| if r == nil { | ||
| return | ||
| } | ||
| if str, ok := r.(string); !ok || !strings.HasPrefix(str, memory.PanicMemoryExceed) { |
There was a problem hiding this comment.
I think a better place is ExecStmt.Exec() function, or ExecStmt.handleNoDelay() and ExecStmt.handlePessimisticSelectForUpdate() function.
|
/run-all-tests |
|
/run-common-test |
bb7133
added
status/LGT2
winkyao
approved these changes
Sep 10, 2019
|
/rebuild |
|
cherry pick to release-3.0 failed |
|
cherry pick to release-2.1 failed |
crazycs520
added a commit
to crazycs520/tidb
that referenced
this pull request
Sep 10, 2019
crazycs520
added a commit
to crazycs520/tidb
that referenced
this pull request
Sep 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Set
oom-action = "cancel"in the tidb config file.When
insert ... selectout of memory quota, TiDB should return errorOut Of Memory Quota, instead of lost connection.What is changed and how it works?
Check List
Tests
Code changes
Side effects
Related changes
Release note
insert from selectstatement panic caused by out of memory quota.