Skip to content

[close #736] Select reachable store (#737) #742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhangyangyu merged 3 commits into from
Apr 27, 2023
Merged

[close #736] Select reachable store (#737) #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2046895
This is an automated cherry-pick of #737
shiyuhang0 Apr 27, 2023
b82155a
Update pom.xml
shiyuhang0 Apr 27, 2023
0c70f02
Merge branch 'release-3.3' into cherry-pick-737-to-release-3.3
zhangyangyu Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/main/java/org/tikv/common/region/RegionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,25 @@ public Pair<TiRegion, TiStore> getRegionStorePairByKey(

TiStore store = null;
if (storeType == TiStoreType.TiKV) {
Peer peer = region.getCurrentReplica();
store = getStoreById(peer.getStoreId(), backOffer);
// check from the first replica in case it recovers
List<Peer> replicaList = region.getReplicaList();
for (int i = 0; i < replicaList.size(); i++) {
Peer peer = replicaList.get(i);
store = getStoreById(peer.getStoreId(), backOffer);
if (store.isReachable()) {
// update replica's index
region.setReplicaIdx(i);
break;
}
logger.info("Store {} is unreachable, try to get the next replica", peer.getStoreId());
}
} else {
List<TiStore> tiflashStores = new ArrayList<>();
for (Peer peer : region.getLearnerList()) {
TiStore s = getStoreById(peer.getStoreId(), backOffer);
if (!s.isReachable()) {
continue;
}
for (Metapb.StoreLabel label : s.getStore().getLabelsList()) {
if (label.getKey().equals(storeType.getLabelKey())
&& label.getValue().equals(storeType.getLabelValue())) {
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/tikv/common/region/TiRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ public Peer getNextReplica() {
return getCurrentReplica();
}

public void setReplicaIdx(int idx) {
replicaIdx = idx;
}

public List<Peer> getReplicaList() {
return replicaList;
}

private boolean isLeader(Peer peer) {
return getLeader().equals(peer);
}
Expand Down