Skip to content

store/tikv: fix misuse of PD client's GetStore (#23695)#24498

Merged
ti-chi-bot merged 5 commits intopingcap:release-4.0from
ti-srebot:release-4.0-addbd46c3dd1
May 12, 2021
Merged

store/tikv: fix misuse of PD client's GetStore (#23695)#24498
ti-chi-bot merged 5 commits intopingcap:release-4.0from
ti-srebot:release-4.0-addbd46c3dd1

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 8, 2021

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

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24498

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

git push git@github.com:ti-srebot/tidb.git pr/24498:release-4.0-addbd46c3dd1

Signed-off-by: longfangsong longfangsong@icloud.com

What problem does this PR solve?

Issue Number: close #23676

Problem Summary:

  • TiDB wrongly uses the PD client's GetStore(), which may result in dead loops.
  • store.State isn't changed if it becomes a tombstone

What is changed and how it works?

What's Changed:

Skip the early-return if branch when "load Store from PD success but pd didn't found the store"

How it Works:

By checking the error message. This is a quick and dirty solution. A better solution (which needs to change the pdClient, and maybe the whole way of our error handling process) needs more discussion.

Related changes

  • Need to cherry-pick to the release branch
    Needs to cherry-pick to 5.0.

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/transaction SIG:Transaction size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick labels May 8, 2021
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 8, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone May 8, 2021
@ti-srebot
Copy link
Contributor Author

@longfangsong please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/tidb/invitations

@youjiali1995 youjiali1995 force-pushed the release-4.0-addbd46c3dd1 branch from c580c91 to 11457c5 Compare May 10, 2021 05:42
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 10, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 10, 2021
@youjiali1995
Copy link
Contributor

/run-check-dev

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • MyonKeminta
  • youjiali1995

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 11, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 2021
@zhouqiang-cl
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 11457c54d222ad137f573be356fcc649b7fcf5e8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2021
@zhouqiang-cl
Copy link
Contributor

/run-check_dev

@youjiali1995 youjiali1995 force-pushed the release-4.0-addbd46c3dd1 branch from 2e67738 to 333f0a8 Compare May 12, 2021 06:50
@youjiali1995
Copy link
Contributor

/merge

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
@youjiali1995 youjiali1995 force-pushed the release-4.0-addbd46c3dd1 branch from c2ac4f4 to 0172c1b Compare May 12, 2021 07:24
@youjiali1995
Copy link
Contributor

/merge

@youjiali1995
Copy link
Contributor

/run-unit-test

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit 996e89f into pingcap:release-4.0 May 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick-approved Cherry pick PR approved by release team. sig/transaction SIG:Transaction size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants