Skip to content

Conversation

@ti-srebot
Copy link
Collaborator

@ti-srebot ti-srebot commented Dec 9, 2021

cherry-pick #366 to release-3.1
You can switch your code base to this Pull Request by using git-extras:

# In client-java repo:
git pr https://github.com/tikv/client-java/pull/371

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/client-java.git pr/371:release-3.1-1dd7cbabe828

What problem does this PR solve?

This pull request fixes the NPE triggered by the double retry of seekLeaderStore. These buggy lines would also introduce another issue like peer id not match because the meta of the region is not updated.

What is changed and how it works?

Once we change detected a reachable store we need to update the peer information of the region and retry in the most outside code.

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to be included in the release note

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Collaborator Author

/run-all-tests

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@birdstorm birdstorm left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason merged commit e2a1b6d into tikv:release-3.1 Dec 9, 2021
@zz-jason zz-jason mentioned this pull request Dec 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants