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

Fix NullPointerException in getStore (#359) (#364)

This commit is contained in:
ti-srebot 2021-12-07 09:42:53 +08:00 committed by GitHub
parent e672c46dfe
commit bf1eefacd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/tikv/common/PDClient.java
View File

@ -280,9 +280,16 @@ public class PDClient extends AbstractGRPCClient<PDBlockingStub, PDFutureStub>
@Override @Override
public Store getStore(BackOffer backOffer, long storeId) { public Store getStore(BackOffer backOffer, long storeId) {
return callWithRetry( GetStoreResponse resp =
backOffer, PDGrpc.getGetStoreMethod(), buildGetStoreReq(storeId), buildPDErrorHandler()) callWithRetry(
.getStore(); backOffer,
PDGrpc.getGetStoreMethod(),
buildGetStoreReq(storeId),
buildPDErrorHandler());
if (resp != null) {
return resp.getStore();
}
return null;
} }
@Override @Override

2
src/main/java/org/tikv/common/region/StoreHealthyChecker.java
View File

@ -81,7 +81,7 @@ public class StoreHealthyChecker implements Runnable {
private boolean checkStoreTombstone(TiStore store) { private boolean checkStoreTombstone(TiStore store) {
try { try {
Metapb.Store newStore = pdClient.getStore(ConcreteBackOffer.newRawKVBackOff(), store.getId()); Metapb.Store newStore = pdClient.getStore(ConcreteBackOffer.newRawKVBackOff(), store.getId());
if (newStore.getState() == Metapb.StoreState.Tombstone) { if (newStore != null && newStore.getState() == Metapb.StoreState.Tombstone) {
return true; return true;
} }
} catch (Exception e) { } catch (Exception e) {