clientv3: only return closing error to watcher if context is not canceled

Fixes #6503
2016-10-04 16:09:50 -07:00 · 2016-10-04 16:09:50 -07:00 · e853451cd2
parent 1becf9d2f5
commit e853451cd2
1 changed files with 1 additions and 1 deletions
--- 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)