tikv: fix infinite follower/learner retry when network partition only…

… between leader and follower/learner (#17441) (#17443)
pingcap · May 30, 2020 · abe3e72 · abe3e72
1 parent 689a6b6
commit abe3e72
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/store/tikv/region_cache.go b/store/tikv/region_cache.go
@@ -521,9 +521,11 @@ func (c *RegionCache) OnSendFail(bo *Backoffer, ctx *RPCContext, scheduleReload
 		rs := r.getStore()
 		if err != nil {
 			s := rs.stores[ctx.PeerIdx]
+			followerRead := int(rs.workTiKVIdx) != ctx.PeerIdx
 
-			// send fail but store is reachable, keep retry current peer.
-			if s.requestLiveness(bo) == reachable {
+			// send fail but store is reachable, keep retry current peer for replica leader request.
+			// but we still need switch peer for follower-read or learner-read(i.e. tiflash)
+			if ctx.Store.storeType == kv.TiKV && !followerRead && s.requestLiveness(bo) == reachable {
 				return
 			}