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

update kvproto version (#128) 

Signed-off-by: birdstorm <samuelwyf@hotmail.com>
This commit is contained in:
birdstorm 2021-02-20 15:36:54 +08:00 committed by GitHub
parent 7dfa1df52c
commit 10d8efbbc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/proto.sh
View File

@ -18,7 +18,7 @@ CURRENT_DIR=`pwd`
TIKV_CLIENT_HOME="$(cd "`dirname "$0"`"/..; pwd)" TIKV_CLIENT_HOME="$(cd "`dirname "$0"`"/..; pwd)"
cd $TIKV_CLIENT_HOME cd $TIKV_CLIENT_HOME
kvproto_hash=2cf9a243b8d589f345de1dbaa9eeffec6afbdc06 kvproto_hash=b2375dcc80adc9c9423bd010592c045241f29d5a
raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926 raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926

11
src/main/java/org/tikv/common/region/TiRegion.java
View File

@ -118,23 +118,26 @@ public class TiRegion implements Serializable {
return meta.getPeers(followerIdx); return meta.getPeers(followerIdx);
} }
private boolean isValidFollower(Peer peer) {
return Metapb.PeerRole.valueOf(peer.getRole().getValueDescriptor()) == Metapb.PeerRole.Voter;
}
private void chooseRandomFollower() { private void chooseRandomFollower() {
int cnt = meta.getPeersCount(); int cnt = meta.getPeersCount();
followerIdx = new Random().nextInt(cnt); followerIdx = new Random().nextInt(cnt);
for (int retry = cnt - 1; retry > 0; retry--) { for (int retry = cnt - 1; retry > 0; retry--) {
followerIdx = (followerIdx + 1) % cnt; followerIdx = (followerIdx + 1) % cnt;
Peer cur = meta.getPeers(followerIdx); Peer cur = meta.getPeers(followerIdx);
if (cur.getIsLearner()) { if (isValidFollower(cur)) {
continue; return;
} }
return;
} }
} }
public List<Peer> getLearnerList() { public List<Peer> getLearnerList() {
List<Peer> peers = new ArrayList<>(); List<Peer> peers = new ArrayList<>();
for (Peer peer : getMeta().getPeersList()) { for (Peer peer : getMeta().getPeersList()) {
if (peer.getIsLearner()) { if (isValidFollower(peer)) {
peers.add(peer); peers.add(peer);
} }
} }