*: fix two minor bugs (#1553)

Signed-off-by: zyguan <[email protected]>
tikv · Jan 13, 2025 · a348c17 · a348c17
1 parent d355434
commit a348c17
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -860,7 +860,7 @@ func (s *RegionRequestSender) SendReqCtx(
 		if req.InputRequestSource != "" && s.replicaSelector != nil {
 			patchRequestSource(req, s.replicaSelector.replicaType())
 		}
-		if e := tikvrpc.SetContext(req, rpcCtx.Meta, rpcCtx.Peer); e != nil {
+		if err := tikvrpc.SetContext(req, rpcCtx.Meta, rpcCtx.Peer); err != nil {
 			return nil, nil, retryTimes, err
 		}
 		if s.replicaSelector != nil {

diff --git a/txnkv/txnsnapshot/snapshot.go b/txnkv/txnsnapshot/snapshot.go
@@ -436,6 +436,7 @@ func (s *KVSnapshot) batchGetSingleRegion(bo *retry.Backoffer, batch batchKeys,
 		s.mu.RLock()
 		req, err := s.buildBatchGetRequest(pending, busyThresholdMs, readTier)
 		if err != nil {
+			s.mu.RUnlock()
 			return err
 		}
 		req.InputRequestSource = s.GetRequestSource()