浏览代码

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

gary rong 6 年之前
父节点
当前提交
e4cb7b80d5
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      rpc/handler.go

+ 1 - 1
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)
 }