Merge branch 'master' into dependabot/go_modules/examples/gcworker/go…

…lang.org/x/net-0.17.0
tikv · Oct 20, 2023 · 2f17521 · 2f17521
2 parents c84c408 + 476ea22
commit 2f17521
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -1449,13 +1449,13 @@ func (s *RegionRequestSender) SendReqCtx(
 			}
 		}
 
-		if e := tikvrpc.SetContext(req, rpcCtx.Meta, rpcCtx.Peer); e != nil {
-			return nil, nil, retryTimes, err
-		}
 		rpcCtx.contextPatcher.applyTo(&req.Context)
 		if req.InputRequestSource != "" && s.replicaSelector != nil {
 			s.replicaSelector.patchRequestSource(req, rpcCtx)
 		}
+		if e := tikvrpc.SetContext(req, rpcCtx.Meta, rpcCtx.Peer); e != nil {
+			return nil, nil, retryTimes, err
+		}
 
 		var retry bool
 		resp, retry, err = s.sendReqToRegion(bo, rpcCtx, req, timeout)