From 6fb08672d82565a9b471c67cb1f95c2c433b07de Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Wed, 19 Jul 2017 12:50:17 -0700 Subject: [PATCH] v3rpc: set canceled=true when stream is compacted Fixes #8231 --- etcdserver/api/v3rpc/watch.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index 84c0a5eac..a456307fe 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -321,11 +321,13 @@ func (sws *serverWatchStream) sendLoop() { } } + canceled := wresp.CompactRevision != 0 wr := &pb.WatchResponse{ Header: sws.newResponseHeader(wresp.Revision), WatchId: int64(wresp.WatchID), Events: events, CompactRevision: wresp.CompactRevision, + Canceled: canceled, } if _, hasId := ids[wresp.WatchID]; !hasId {