clientv3: handle watchGrpcStream shutdown if prior to goroutine start #6142
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
| @@ -268,6 +268,13 @@ func (w *watcher) Watch(ctx context.Context, key string, opts ...OpOption) Watch | |||
| case reqc <- wr: | |||
| ok = true | |||
| case <-wr.ctx.Done(): | |||
| // tear down stream if this request is the only one using it | |||
| wgs.mu.Lock() | |||
| if len(wgs.streams) == 0 && wgs.stopc != nil { | |||
There was a problem hiding this comment.
can we make this a method on wgs? I remember we did the same thing in wsg.closestream?
There was a problem hiding this comment.
ok added wgs.stopIfEmpty()
|
lgtm |
heyitsanthony
force-pushed
the
fix-cancel-watch-imm
branch
from
0b80d66
to
1c83a46
Compare
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.
Fixes #6141
Burned the clientv3 Watch tests on my machine for a while just to be sure it's stable.