Skip to content

Fix NullPointerException in getStore #359

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
zz-jason merged 2 commits into from
Dec 6, 2021
Merged

Fix NullPointerException in getStore #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa8b87
fix nullpointerexception in getStore
birdstorm Dec 3, 2021
87791c6
Merge branch 'master' into fix-null-pointer-in-get-store
zz-jason Dec 6, 2021
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
13 changes: 10 additions & 3 deletions src/main/java/org/tikv/common/PDClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,16 @@ private <T> PDErrorHandler<GetStoreResponse> buildPDErrorHandler() {

@Override
public Store getStore(BackOffer backOffer, long storeId) {
return callWithRetry(
backOffer, PDGrpc.getGetStoreMethod(), buildGetStoreReq(storeId), buildPDErrorHandler())
.getStore();
GetStoreResponse resp =
callWithRetry(
backOffer,
PDGrpc.getGetStoreMethod(),
buildGetStoreReq(storeId),
buildPDErrorHandler());
if (resp != null) {
return resp.getStore();
}
return null;
Copy link
Member

@zz-jason zz-jason Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add some comments about:

  1. the possible scenarios where get store fails with a null response
  2. why not throw an exception in those scenarios

}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/tikv/common/region/StoreHealthyChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private boolean checkStoreHealth(TiStore store) {
private boolean checkStoreTombstone(TiStore store) {
try {
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;
}
} catch (Exception e) {
Expand Down