Skip to content

client/v3 fix watch API blocked forever even with WithRequireLeader option #17622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

client/v3 fix watch API blocked forever even with WithRequireLeader option #17622

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client/v3/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,12 +455,13 @@ func (w *watcher) closeStream(wgs *watchGRPCStream) {
w.mu.Unlock()
}

func (w *watchGRPCStream) addSubstream(resp *pb.WatchResponse, ws *watcherStream) {
func (w *watchGRPCStream) addSubstream(resp *pb.WatchResponse, ws *watcherStream, closing map[*watcherStream]struct{}) {
// check watch ID for backward compatibility (<= v3.3)
if resp.WatchId == InvalidWatchID || (resp.Canceled && resp.CancelReason != "") {
w.closeErr = v3rpc.Error(errors.New(resp.CancelReason))
// failed; no channel
close(ws.recvc)
closing[ws] = struct{}{}
return
}
ws.id = resp.WatchId
Expand Down Expand Up @@ -591,7 +592,7 @@ func (w *watchGRPCStream) run() {
// response to head of queue creation
if len(w.resuming) != 0 {
if ws := w.resuming[0]; ws != nil {
w.addSubstream(pbresp, ws)
w.addSubstream(pbresp, ws, closing)
w.dispatchEvent(pbresp)
w.resuming[0] = nil
}
Expand Down