clientv3: do not backport watch compact revision change

Do not backport etcd-io#8283. Signed-off-by: Gyu-Ho Lee <[email protected]>
gyuho · Nov 14, 2017 · 9ae5036 · 9ae5036
1 parent c179697
commit 9ae5036
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go
@@ -516,9 +516,6 @@ func TestWatchCompactRevision(t *testing.T) {
 	if wresp.Err() != rpctypes.ErrCompacted {
 		t.Fatalf("wresp.Err() expected %v, but got %v", rpctypes.ErrCompacted, wresp.Err())
 	}
-	if !wresp.Canceled {
-		t.Fatalf("wresp.Canceled expected true, got %+v", wresp)
-	}
 
 	// ensure the channel is closed
 	if wresp, ok = <-wch; ok {

diff --git a/clientv3/watch.go b/clientv3/watch.go
@@ -463,7 +463,7 @@ func (w *watchGrpcStream) run() {
 				if ws := w.nextResume(); ws != nil {
 					wc.Send(ws.initReq.toPB())
 				}
-			case pbresp.Canceled && pbresp.CompactRevision == 0:
+			case pbresp.Canceled:
 				delete(cancelSet, pbresp.WatchId)
 				if ws, ok := w.substreams[pbresp.WatchId]; ok {
 					// signal to stream goroutine to update closingc