distsql: fix goroutine leak caused huge memory footprint #1834
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
shenli
reviewed
Oct 17, 2016
| @@ -131,6 +135,9 @@ func (r *selectResult) IgnoreData() { | |||
|
|
|||
| // Close closes SelectResult. | |||
| func (r *selectResult) Close() error { | |||
| close(r.cancel) | |||
| for _ = range r.results { | |||
| @@ -253,6 +269,8 @@ func (pr *partialResult) getChunk() *tipb.Chunk { | |||
|
|
|||
| // Close closes the sub result. | |||
| func (pr *partialResult) Close() error { | |||
| for _ = range pr.done { | |||
| ) | ||
|
|
||
| // choose this style because error handle is really boring. | ||
| for step := 0; err == nil && step < 3; step++ { |
There was a problem hiding this comment.
This style is not as clear as the old way.
coocood
reviewed
Oct 18, 2016
| @@ -99,7 +103,7 @@ func (r *selectResult) fetch() { | |||
| ignoreData: r.ignoreData, | |||
| done: make(chan error), | |||
There was a problem hiding this comment.
Make the done channel with buffer length 1 may resolve the issue as well.
And this has minimum code change.
tiancaiamao
changed the title
coocood
reviewed
Oct 18, 2016
| } | ||
| } | ||
|
|
||
| time.Sleep(3 * time.Second) |
There was a problem hiding this comment.
3 seconds seems too long for a single test case.
We can wait a few mili-seconds in a for loop, once the count has reduced to 5, we can break directly.
coocood
reviewed
Oct 18, 2016
|
|
||
| func (resp *mockResponse) Next() (io.ReadCloser, error) { | ||
| resp.count++ | ||
| if resp.count == 500 { |
There was a problem hiding this comment.
We don't need as much as 500 responses for this test case.
coocood
reviewed
Oct 19, 2016
| @@ -73,11 +73,14 @@ func (s *testTableCodecSuite) TestGoroutineLeak(c *C) { | |||
| } | |||
| } | |||
|
|
|||
| time.Sleep(3 * time.Second) | |||
| countAfter := runtime.NumGoroutine() | |||
| for i := time.Duration(0); i < 3*time.Second; i = i + 10*time.Millisecond { | |||
|
LGTM |
zimulala
reviewed
Oct 19, 2016
| @@ -43,3 +50,65 @@ func (s *testTableCodecSuite) TestColumnToProto(c *C) { | |||
| pc := columnToProto(col) | |||
| c.Assert(pc.GetFlag(), Equals, int32(10)) | |||
| } | |||
|
|
|||
| // For Issue 1791 | |||
|
LGTM |
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.
fix a bug in #1791
there may still other unknown problems, I'll test tomorrow.