Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: handle non -1 watch ID on cancellation

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2017-12-22 14:36:38 -08:00
parent 33c732b97c
commit 10522f88f5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clientv3/watch.go
View File

@ -367,7 +367,8 @@ func (w *watcher) closeStream(wgs *watchGrpcStream) {
} }
func (w *watchGrpcStream) addSubstream(resp *pb.WatchResponse, ws *watcherStream) { func (w *watchGrpcStream) addSubstream(resp *pb.WatchResponse, ws *watcherStream) {
if resp.WatchId == -1 { // check watch ID for backward compatibility (<= v3.3)
if resp.WatchId == -1 || (resp.Canceled && resp.CancelReason != "") {
// failed; no channel // failed; no channel
close(ws.recvc) close(ws.recvc)
return return
@ -453,6 +454,7 @@ func (w *watchGrpcStream) run() {
// Watch() requested // Watch() requested
case wreq := <-w.reqc: case wreq := <-w.reqc:
outc := make(chan WatchResponse, 1) outc := make(chan WatchResponse, 1)
// TODO: pass custom watch ID?
ws := &watcherStream{ ws := &watcherStream{
initReq: *wreq, initReq: *wreq,
id: -1, id: -1,
@ -553,6 +555,7 @@ func (w *watchGrpcStream) dispatchEvent(pbresp *pb.WatchResponse) bool {
for i, ev := range pbresp.Events { for i, ev := range pbresp.Events {
events[i] = (*Event)(ev) events[i] = (*Event)(ev)
} }
// TODO: return watch ID?
wr := &WatchResponse{ wr := &WatchResponse{
Header: *pbresp.Header, Header: *pbresp.Header,
Events: events, Events: events,