Fix socket file handle leaks from old blocking queries upon consul re… #3195
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
…load. This fixes issue #3018
slackpad
reviewed
Jun 27, 2017
watch/watch.go
Outdated
| @@ -5,6 +5,8 @@ import ( | |||
| "io" | |||
| "sync" | |||
|
|
|||
| "context" | |||
There was a problem hiding this comment.
This should be sorted into the list above.
| @@ -41,7 +42,7 @@ func keyWatch(params map[string]interface{}) (WatcherFunc, error) { | |||
| } | |||
| fn := func(p *Plan) (uint64, interface{}, error) { | |||
| kv := p.client.KV() | |||
| opts := consulapi.QueryOptions{AllowStale: stale, WaitIndex: p.lastIndex} | |||
| opts := makeQueryOptionsWithContext(p, stale) | |||
There was a problem hiding this comment.
Do all of these watch functions need a defer cancel() in here to clean up in case the request goes through?
There was a problem hiding this comment.
The doc says that it should do that, will fix. Doc also said that go vet should catch it, but it didn't - The go vet tool checks that CancelFuncs are used on all control-flow paths.
|
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.
…load. This fixes issue #3018
Wired up a context to pass through via QueryOptions to the underlying http request. When the watch plan is stopped, it calls cancelFunc on that context.