From a348c17c6b423ae016d80fede1b2a115a85edb5e Mon Sep 17 00:00:00 2001 From: zyguan Date: Mon, 13 Jan 2025 11:38:31 +0800 Subject: [PATCH] *: fix two minor bugs (#1553) Signed-off-by: zyguan --- internal/locate/region_request.go | 2 +- txnkv/txnsnapshot/snapshot.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go index ceb8880d91..03a8cb5789 100644 --- 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 index 6d5abfc1c1..746c51da3b 100644 --- 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()