tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

retry stale read as stale if leader is not accessible (#1566) 

Signed-off-by: rishabh_mittal <mittalrishabh@gmail.com>
This commit is contained in:
mittalrishabh 2025-02-04 19:01:03 -08:00 committed by GitHub
parent d0d0c9712f
commit ad5b9e27f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/locate/region_request3_test.go
View File

@ -1412,9 +1412,6 @@ func (s *testRegionRequestToThreeStoresSuite) TestDoNotTryUnreachableLeader() {
follower, _, _, _ := region.FollowerStorePeer(regionStore, 0, &storeSelectorOp{}) follower, _, _, _ := region.FollowerStorePeer(regionStore, 0, &storeSelectorOp{})
s.regionRequestSender.client = &fnClient{fn: func(ctx context.Context, addr string, req *tikvrpc.Request, timeout time.Duration) (response *tikvrpc.Response, err error) { s.regionRequestSender.client = &fnClient{fn: func(ctx context.Context, addr string, req *tikvrpc.Request, timeout time.Duration) (response *tikvrpc.Response, err error) {
if req.StaleRead && addr == follower.addr {
return &tikvrpc.Response{Resp: &kvrpcpb.GetResponse{RegionError: &errorpb.Error{DataIsNotReady: &errorpb.DataIsNotReady{}}}}, nil
}
return &tikvrpc.Response{Resp: &kvrpcpb.GetResponse{ return &tikvrpc.Response{Resp: &kvrpcpb.GetResponse{
Value: []byte(addr), Value: []byte(addr),
}}, nil }}, nil

2
internal/locate/region_request_state_test.go
View File

@ -333,7 +333,7 @@ func TestRegionCacheStaleRead(t *testing.T) {
leaderRegionValid: true, leaderRegionValid: true,
leaderAsyncReload: util.Some(true), leaderAsyncReload: util.Some(true),
leaderSuccessReplica: []string{"z2", "z3"}, leaderSuccessReplica: []string{"z2", "z3"},
leaderSuccessReadType: SuccessFollowerRead, leaderSuccessReadType: SuccessStaleRead,
followerRegionValid: true, followerRegionValid: true,
followerAsyncReload: util.None[bool](), followerAsyncReload: util.None[bool](),
followerSuccessReplica: []string{"z2"}, followerSuccessReplica: []string{"z2"},

4
internal/locate/replica_selector.go
View File

@ -307,8 +307,8 @@ func (s *ReplicaSelectMixedStrategy) next(selector *replicaSelector) *replica {
func (s *ReplicaSelectMixedStrategy) canSendReplicaRead(selector *replicaSelector) bool { func (s *ReplicaSelectMixedStrategy) canSendReplicaRead(selector *replicaSelector) bool {
replicas := selector.replicas replicas := selector.replicas
replica := replicas[s.leaderIdx] replica := replicas[s.leaderIdx]
if replica.hasFlag(deadlineErrUsingConfTimeoutFlag) || replica.hasFlag(serverIsBusyFlag) { if replica.attempts == 0 || replica.hasFlag(deadlineErrUsingConfTimeoutFlag) || replica.hasFlag(serverIsBusyFlag) {
// don't overwhelm the leader if it is busy // don't do the replica read if leader is not exhausted or leader has timeout or server busy error.
return false return false
} }
return true return true

2
internal/locate/replica_selector_test.go
View File

@ -2144,7 +2144,7 @@ func TestReplicaReadAccessPathByStaleReadCase(t *testing.T) {
beforeRun: func() { /* don't resetStoreState */ }, beforeRun: func() { /* don't resetStoreState */ },
expect: &accessPathResult{ expect: &accessPathResult{
accessPath: []string{ accessPath: []string{
"{addr: store3, replica-read: true, stale-read: false}", "{addr: store3, replica-read: false, stale-read: true}",
}, },
respErr: "", respErr: "",
respRegionError: fakeEpochNotMatch, respRegionError: fakeEpochNotMatch,