executor: correctly handle panic for hashjoin build phase #14056
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
Codecov Report
@@ Coverage Diff @@
## master #14056 +/- ##
===========================================
Coverage ? 80.1669%
===========================================
Files ? 483
Lines ? 121126
Branches ? 0
===========================================
Hits ? 97103
Misses ? 16288
Partials ? 7735 |
SunRunAway
reviewed
Dec 13, 2019
zz-jason
reviewed
Dec 17, 2019
executor/join.go
Outdated
| @@ -16,6 +16,7 @@ package executor | |||
| import ( | |||
| "context" | |||
| "fmt" | |||
| "github.com/pingcap/failpoint" | |||
There was a problem hiding this comment.
please reorg the import packages.
jackysp
reviewed
Dec 17, 2019
executor/join_test.go
Outdated
| @@ -16,6 +16,7 @@ package executor_test | |||
| import ( | |||
| "context" | |||
| "fmt" | |||
| "github.com/pingcap/failpoint" | |||
There was a problem hiding this comment.
Please move it to the 3rd party libs.
lonng
reviewed
Dec 20, 2019
executor/join.go
Outdated
| @@ -244,6 +246,11 @@ func (e *HashJoinExec) fetchBuildSideRows(ctx context.Context, chkCh chan<- *chu | |||
| e.buildFinished <- errors.Trace(err) | |||
| return | |||
| } | |||
| failpoint.Inject("errorFetchBuildSideRowsMockOOMPanic", func(val failpoint.Value) { | |||
There was a problem hiding this comment.
failpoint.Inject("errorFetchBuildSideRowsMockOOMPanic", nil) and c.Assert(failpoint.Enable("github.com/pingcap/tidb/executor/errorFetchBuildSideRowsMockOOMPanic", panic), IsNil)
lonng
reviewed
Dec 20, 2019
executor/join_test.go
Outdated
Comment on lines
83
to
87
| c.Assert(failpoint.Enable("github.com/pingcap/tidb/executor/errorFetchBuildSideRowsMockOOMPanic", `return(true)`), IsNil) | ||
| defer func() { | ||
| c.Assert(failpoint.Disable("github.com/pingcap/tidb/executor/errorFetchBuildSideRowsMockOOMPanic"), IsNil) | ||
| }() |
There was a problem hiding this comment.
Prefer to:
fpName := "github.com/pingcap/tidb/executor/errorFetchBuildSideRowsMockOOMPanic"
c.Assert(failpoint.Enable(fpName, `panic`), IsNil)
defer func() {
c.Assert(failpoint.Disable(fpName), IsNil)
}()
zz-jason
reviewed
Dec 28, 2019
executor/join.go
Outdated
| @@ -232,6 +233,7 @@ var buildSideResultLabel fmt.Stringer = stringutil.StringerStr("hashJoin.buildSi | |||
| // fetchBuildSideRows fetches all rows from build side executor, and append them | |||
| // to e.buildSideResult. | |||
| func (e *HashJoinExec) fetchBuildSideRows(ctx context.Context, chkCh chan<- *chunk.Chunk, doneCh <-chan struct{}) { | |||
|
|
|||
|
@fzhedu, please update your pull request. |
1 similar comment
|
@fzhedu, please update your pull request. |
|
@fzhedu PR closed due to no update for a long time. Feel free to reopen it anytime. |
XuHuaiyu
force-pushed
the
panic
branch
4 times, most recently
from
e0cd2e8 to
ed1d120
Compare
|
/run-unit-test |
XuHuaiyu
changed the title
|
/rebuild |
1 similar comment
|
/rebuild |
|
/build |
|
/run-all-tests |
zz-jason
added
status/can-merge
|
Your auto merge job has been accepted, waiting for 14637 |
|
/run-all-tests |
|
cherry pick to release-3.0 failed |
|
cherry pick to release-2.1 failed |
XuHuaiyu
pushed a commit
to XuHuaiyu/tidb
that referenced
this pull request
Feb 5, 2020
XuHuaiyu
pushed a commit
to XuHuaiyu/tidb
that referenced
this pull request
Feb 5, 2020
sre-bot
pushed a commit
that referenced
this pull request
Feb 5, 2020
sre-bot
pushed a commit
that referenced
this pull request
Feb 5, 2020
hsqlu
pushed a commit
to hsqlu/tidb
that referenced
this pull request
Feb 8, 2020
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?
Fix #14027
What is changed and how it works?
handle the panic when OOM during build a hash table
Check List
Tests
Code changes
Side effects
Related changes
3.0.5
Release note