*: fix panic log when call RegionRequestSender.String method

Signed-off-by: crazycs520 <[email protected]>
tikv · Apr 3, 2024 · a1e0bb3 · a1e0bb3
1 parent 125a140
commit a1e0bb3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/internal/locate/region_request.go b/internal/locate/region_request.go
@@ -117,7 +117,10 @@ type RegionRequestSender struct {
 }
 
 func (s *RegionRequestSender) String() string {
-	return fmt.Sprintf("{rpcError:%v,replicaSelector: %v}", s.rpcError, s.replicaSelector.String())
+	if s.replicaSelector == nil {
+		return fmt.Sprintf("{rpcError:%v, replicaSelector: %v}", s.rpcError, s.replicaSelector)
+	}
+	return fmt.Sprintf("{rpcError:%v, replicaSelector: %v}", s.rpcError, s.replicaSelector.String())
 }
 
 // RegionRequestRuntimeStats records the runtime stats of send region requests.

diff --git a/internal/locate/region_request_test.go b/internal/locate/region_request_test.go
@@ -818,3 +818,13 @@ func (s *testRegionRequestToSingleStoreSuite) TestClientExt() {
 	s.NotNil(sender.client)
 	s.Nil(sender.getClientExt())
 }
+
+func (s *testRegionRequestToSingleStoreSuite) TestRegionRequestSenderString() {
+	sender := NewRegionRequestSender(s.cache, &fnClient{})
+	loc, err := s.cache.LocateRegionByID(s.bo, s.region)
+	s.Nil(err)
+	// invalid region cache before sending request.
+	s.cache.InvalidateCachedRegion(loc.Region)
+	sender.SendReqCtx(s.bo, tikvrpc.NewRequest(tikvrpc.CmdGet, &kvrpcpb.GetRequest{}), loc.Region, time.Second, tikvrpc.TiKV)
+	s.Equal("{rpcError:cached region invalid, replicaSelector: <nil>}", sender.String())
+}