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

6 years ago · e4cb7b80d5
parent 22e1d2ce03
commit e4cb7b80d5
1 changed files with 1 additions and 1 deletions
--- 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)
 }