From e853451cd241406b035946ca40949fc2af9db08d Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Tue, 4 Oct 2016 16:09:50 -0700 Subject: [PATCH] clientv3: only return closing error to watcher if context is not canceled Fixes #6503 --- clientv3/watch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clientv3/watch.go b/clientv3/watch.go index dac035584..a8ce38ed0 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -342,7 +342,7 @@ func (w *watchGrpcStream) closeSubstream(ws *watcherStream) { default: } // close subscriber's channel - if closeErr := w.closeErr; closeErr != nil { + if closeErr := w.closeErr; closeErr != nil && ws.initReq.ctx.Err() == nil { go w.sendCloseSubstream(ws, &WatchResponse{closeErr: w.closeErr}) } else { close(ws.outc)