From e6bf97ec74938438853dde1d603e179fcea2ebe2 Mon Sep 17 00:00:00 2001
From: shi yuhang <52435083+shiyuhang0@users.noreply.github.com>
Date: Tue, 20 Dec 2022 20:31:42 +0800
Subject: [PATCH] cherry pick #664 to release-3.3

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
---
 src/main/java/org/tikv/common/region/RegionManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/tikv/common/region/RegionManager.java b/src/main/java/org/tikv/common/region/RegionManager.java
index 45cfc5160d9..2d84f9988e4 100644
--- a/src/main/java/org/tikv/common/region/RegionManager.java
+++ b/src/main/java/org/tikv/common/region/RegionManager.java
@@ -203,9 +203,11 @@ public Pair<TiRegion, TiStore> getRegionStorePairByKey(
           }
         }
       }
-      // select a tiflash with RR strategy
+      // select a tiflash with Round-Robin strategy
       if (tiflashStores.size() > 0) {
-        store = tiflashStores.get(tiflashStoreIndex.getAndIncrement() % tiflashStores.size());
+        store =
+            tiflashStores.get(
+                Math.floorMod(tiflashStoreIndex.getAndIncrement(), tiflashStores.size()));
       }
 
       if (store == null) {