Merge branch 'release-3.3' into cherry-pick-748-to-release-3.3

This commit is contained in:
shi yuhang 2023-05-31 17:18:48 +08:00 committed by GitHub
commit ff338f4ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions

View File

@ -177,8 +177,13 @@ public class RegionManager {
Pair<Metapb.Region, Metapb.Peer> regionAndLeader = pdClient.getRegionByKey(backOffer, key);
region =
cache.putRegion(createRegion(regionAndLeader.first, regionAndLeader.second, backOffer));
logger.debug(
String.format(
"get region id: %d with leader: %d",
region.getId(), region.getLeader().getStoreId()));
}
} catch (Exception e) {
logger.warn("Get region failed: ", e);
return null;
} finally {
requestTimer.observeDuration();
@ -240,6 +245,10 @@ public class RegionManager {
}
logger.info("Store {} is unreachable, try to get the next replica", peer.getStoreId());
}
// Does not set unreachable store to null in case it is incompatible with GrpcForward
if (store == null || !store.isReachable()) {
logger.warn("No TiKV store available for region: " + region);
}
} else {
List<TiStore> tiflashStores = new ArrayList<>();
for (Peer peer : region.getLearnerList()) {