Skip to content

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

Merged
ti-chi-bot merged 7 commits intopingcap:masterfrom
longfangsong:master
Mar 31, 2021
Merged

store/tikv: fix misuse of PD client's GetStore#23695
ti-chi-bot merged 7 commits intopingcap:masterfrom
longfangsong:master

Conversation

@longfangsong
Copy link
Contributor

@longfangsong longfangsong commented Mar 30, 2021

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-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 30, 2021
@longfangsong
store/tikv: fix misuse of PD client's GetStore
5d6f8ca 
Signed-off-by: longfangsong <longfangsong@icloud.com>
@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 30, 2021
@longfangsong
Copy link
Contributor Author

longfangsong commented Mar 30, 2021

/cc @youjiali1995

@ti-chi-bot ti-chi-bot requested a review from youjiali1995 March 30, 2021 10:57
longfangsong
longfangsong commented Mar 30, 2021
View reviewed changes
@longfangsong longfangsong requested a review from a team as a code owner March 30, 2021 11:46
@longfangsong longfangsong requested review from winoros and removed request for a team March 30, 2021 11:46
@longfangsong
add more possible error message on "pd didn't found the store"
96d4592 
Signed-off-by: longfangsong <longfangsong@icloud.com>
(cherry picked from commit 630d390e5c414b92d749b8df7e470c6b21310f4e)
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 30, 2021
youjiali1995
youjiali1995 reviewed Mar 30, 2021
View reviewed changes
@youjiali1995
Copy link
Contributor

youjiali1995 commented Mar 30, 2021

Seems the root cause of #22907 is not this PR. Nevertheless, this PR fixes some problems.

@youjiali1995 youjiali1995 added the sig/transaction SIG:Transaction label Mar 30, 2021
@ichn-hu ichn-hu mentioned this pull request Mar 30, 2021
Closed
@longfangsong
apply the suggestions in code review
bb1d75b 
Signed-off-by: longfangsong <longfangsong@icloud.com>
@longfangsong
Merge branch 'master' into master
ac0a96e 
Signed-off-by: longfangsong <longfangsong@icloud.com>
@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 Mar 30, 2021
MyonKeminta
MyonKeminta reviewed Mar 30, 2021
View reviewed changes
Copy link
Contributor

@MyonKeminta MyonKeminta left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 30, 2021

@MyonKeminta: Please use /LGTM instead of LGTM when you want to approve the pull request by comment.
If you use the GitHub review feature, please approve the PR directly, the comment will not take effect in the GitHub review feature.
If you have any qustions please refer to lgtm command help or lgtm plugin design.

If you have approved this PR, please ignore this reply. This reply is being used as a temporary reply during the migration of the new bot and will be removed on April 1.

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 30, 2021
@lysu
Copy link
Contributor

lysu commented Mar 30, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 30, 2021

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

DetailsCommit hash: ac0a96e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 30, 2021
@ti-chi-bot ti-chi-bot merged commit addbd46 into pingcap:master Mar 31, 2021
@zhangjinpeng87
Copy link
Contributor

zhangjinpeng87 commented Apr 2, 2021

Should we pick this fix to 5.0?

@youjiali1995
Copy link
Contributor

youjiali1995 commented Apr 2, 2021

Should we pick this fix to 5.0?

@zhangjinpeng1987 No. Even though TiDB wrongly uses it, TiDB works well with no issues.

@youjiali1995
Copy link
Contributor

youjiali1995 commented May 8, 2021

/run-cherry-picker

@ti-srebot ti-srebot mentioned this pull request May 8, 2021
Merged
@ti-srebot
Copy link
Contributor

ti-srebot commented May 8, 2021

cherry pick to release-4.0 in PR #24498

@ti-srebot ti-srebot mentioned this pull request May 8, 2021
Closed
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 8, 2021
@longfangsong @ti-srebot
cherry pick pingcap#23695 to release-3.0
8085d54 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

ti-srebot commented May 8, 2021

cherry pick to release-3.0 in PR #24499

@ti-srebot ti-srebot mentioned this pull request May 8, 2021
Closed
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request May 8, 2021
@longfangsong @ti-srebot
cherry pick pingcap#23695 to release-5.0
19aa2f4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

ti-srebot commented May 8, 2021

cherry pick to release-5.0 in PR #24500

youjiali1995 pushed a commit to ti-srebot/tidb that referenced this pull request May 12, 2021
@longfangsong @youjiali1995
cherry pick pingcap#23695 to release-4.0
0172c1b 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
ti-chi-bot pushed a commit that referenced this pull request May 12, 2021
@ti-srebot
store/tikv: fix misuse of PD client's GetStore (#23695) (#24498)
996e89f
youjiali1995 pushed a commit to youjiali1995/tidb that referenced this pull request Jun 30, 2021
@longfangsong @youjiali1995
store/tikv: fix misuse of PD client's GetStore (pingcap#23695)
483a504
@youjiali1995 youjiali1995 mentioned this pull request Jun 30, 2021
Merged
youjiali1995 pushed a commit to youjiali1995/tidb that referenced this pull request Jun 30, 2021
@longfangsong @youjiali1995
store/tikv: fix misuse of PD client's GetStore (pingcap#23695)
e3e6989
@youjiali1995 youjiali1995 mentioned this pull request Jun 30, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MyonKeminta MyonKeminta MyonKeminta approved these changes

@winoros winoros Awaiting requested review from winoros

+1 more reviewer

@youjiali1995 youjiali1995 youjiali1995 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs-cherry-pick-release-5.0 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

TiDB wrongly uses PD client's GetStore which may result in dead loops

8 participants

@longfangsong @youjiali1995 @ti-chi-bot @zhouqiang-cl @lysu @zhangjinpeng87 @ti-srebot @MyonKeminta