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

*: return -1 for canceled watch request

Browse Source
This commit is contained in:
Gyu-Ho Lee 2016-02-26 14:06:40 -08:00
parent 2ec138b160
commit 4a0a83380e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/api/v3rpc/watch.go
View File

@ -111,6 +111,7 @@ func (sws *serverWatchStream) recvLoop() error {
} else if rev > wsrev { // do not allow watching future revision. } else if rev > wsrev { // do not allow watching future revision.
sws.ctrlStream <- &pb.WatchResponse{ sws.ctrlStream <- &pb.WatchResponse{
Header: sws.newResponseHeader(wsrev), Header: sws.newResponseHeader(wsrev),
WatchId: -1,
Created: true, Created: true,
Canceled: true, Canceled: true,
} }

5
integration/v3_watch_test.go
View File

@ -807,7 +807,8 @@ func TestV3WatchInvalidFutureRevision(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("wStream.Recv error: %v", err) t.Errorf("wStream.Recv error: %v", err)
} }
if !resp.Created || !resp.Canceled || len(resp.Events) != 0 { if resp.WatchId != -1 || !resp.Created || !resp.Canceled || len(resp.Events) != 0 {
t.Errorf("invalid start rev should return true, true, 0, but got %v, %v, %d", resp.Created, resp.Canceled, len(resp.Events)) t.Errorf("invalid start-rev expected -1, true, true, 0, but got %d, %v, %v, %d",
resp.WatchId, resp.Created, resp.Canceled, len(resp.Events))
} }
} }