store/tikv: wait task channel in Close #2925
Merged
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
Makes test more stable. Close distsql result and partial result in executor.
ngaut
changed the title
shenli
reviewed
Mar 26, 2017
| @@ -888,6 +891,7 @@ func (e *XSelectTableExec) Next() (*Row, error) { | |||
| } | |||
| if rowData == nil { | |||
| // Finish the current partial result and get the next one. | |||
| e.partialResult.Close() | |||
There was a problem hiding this comment.
The partial result should be closed, may fix the potential memory leak.
There was a problem hiding this comment.
But in this case, the result has been consumed already, there should not have memory leak.
There was a problem hiding this comment.
- partialResult.Close() is a null operation, in distsql/distsql.go
// Close closes the sub result.
func (pr *partialResult) Close() error {
return nil
}
- I'm afraid Close is called many times.
|
LGTM |
tiancaiamao
reviewed
Mar 27, 2017
| @@ -488,6 +488,7 @@ func (it *copIterator) handleRegionErrorTask(bo *Backoffer, task *copTask) []cop | |||
|
|
|||
| func (it *copIterator) Close() error { | |||
| close(it.finished) | |||
| it.wg.Wait() | |||
There was a problem hiding this comment.
Why need wait here? It's already used in run() function.
There was a problem hiding this comment.
To make sure the worker goroutines have exited.
tiancaiamao
reviewed
Mar 27, 2017
| defer func() { | ||
| close(ch) | ||
| close(workCh) | ||
| idxResult.Close() |
There was a problem hiding this comment.
move it to executeTask and write like this?
tblResult, err := e.doTableRequest(task.handles)
if err != nil {
return errors.Trace(err)
}
defer tblResult.Close()
There was a problem hiding this comment.
It's index result, not table result.
|
LGTM |
tiancaiamao
approved these changes
Mar 27, 2017
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.
Makes test more stable.
Close distsql result and partial result in executor.