grpcproxy: reliably track rid in watchergroups #6789
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
xiang90
reviewed
Nov 2, 2016
| @@ -63,7 +63,10 @@ func (wg *watcherGroup) broadcast(wr clientv3.WatchResponse) { | |||
|
|
|||
| wg.rev = wr.Header.Revision | |||
| for _, r := range wg.receivers { | |||
| r.send(wr) | |||
| if !r.send(wr) { | |||
| wg.cancel() | |||
There was a problem hiding this comment.
why do we need to cancel the entire watch group here? we should only cancel that single watcher stream connected to one client, right?
There was a problem hiding this comment.
Mostly an artifact of the wrong information being passed around. Will fix.
heyitsanthony
force-pushed
the
grpcproxy-close-send
branch
from
2f64e81 to
5a36be7
Compare
|
all fixed /cc @xiang90 |
Couldn't find watcher group from rid on server stream close, leading to the watcher group sending on a closed channel. Also got rid of send closing the watcher stream if the buffer is full, this could lead to a send after close while broadcasting to all receivers. Instead, if a send times out then the server stream is canceled. Fixes etcd-io#6739
heyitsanthony
force-pushed
the
grpcproxy-close-send
branch
from
5a36be7 to
8ec4215
Compare
|
LGTM! Thanks. |
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.
Couldn't find watcher group from rid on server stream close, leading to
watcher group sending on a closed channel.
Also got rid of send closing the watcher stream if the buffer is full,
this could lead to a send after close while broadcasting to all receivers.
Instead, if a send times out, have the caller issue a cancel().
Fixes #6739
/cc @xiang90