rpc: cancel root context after all requests are served (#19430)

e4cb7b80 · gary rong · Péter Szilágyi · 22e1d2ce · e4cb7b80
Commit e4cb7b80 authored Apr 10, 2019 by gary rong Committed by Péter Szilágyi Apr 10, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

handler.go rpc/handler.go +1 -1

No files found.
--- a/rpc/handler.go
+++ b/rpc/handler.go
@@ -151,8 +151,8 @@ func (h *handler) handleMsg(msg *jsonrpcMessage) {
 // call goroutines to shut down.
 func (h *handler) close(err error, inflightReq *requestOp) {
 	h.cancelAllRequests(err, inflightReq)
-	h.cancelRoot()
 	h.callWG.Wait()
+	h.cancelRoot()
 	h.cancelServerSubscriptions(err)
 }