Skip to content
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

Jump to bottom

tikv: drop store's regions when resolve store with tombstone status #22909

Merged
merged 5 commits into from
Mar 3, 2021
Merged

tikv: drop store's regions when resolve store with tombstone status #22909

merged 5 commits into from
Mar 3, 2021

Conversation

lysu
Copy link
Contributor

@lysu lysu commented Feb 24, 2021 •
edited
Loading

Signed-off-by: lysu [email protected]

What problem does this PR solve?

Issue Number: close #22907

Problem Summary:

old store id can get old tombstone store, so never have chance to refresh region peer to point to new store id

so request will block forever in old store with EpochNotMatchError

What is changed and how it works?

What's Changed:

drop region cache when resolve store but it's tombstone status

How it Works:

after it, retry will re-fetch new region info from PD which point to new store id..

so continue request will got to new store and never block

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch 4.0/3.0

Check List

Tests

  • Unit test
  • Integration test

Side effects

  • n/a

Release note

  • Fix request block forever when replace a tombstone store with the store has same IP addr

This change is Reviewable

@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2021
@lysu lysu added type/bugfix This PR fixes a bug. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 24, 2021
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2021
@pingcap pingcap deleted a comment from ti-chi-bot Feb 24, 2021
@lysu
Copy link
Contributor Author

lysu commented Feb 24, 2021

/cc @MyonKeminta @coocood

@lysu
Copy link
Contributor Author

lysu commented Feb 24, 2021

/cc @HunDunDM

@ti-chi-bot ti-chi-bot requested a review from HunDunDM February 24, 2021 07:16
lysu
lysu commented Feb 24, 2021
View reviewed changes
store/tikv/region_cache.go
@@ -1516,7 +1516,7 @@ func (s *Store) reResolve(c *RegionCache) {
// we cannot do backoff in reResolve loop but try check other store and wait tick.
return
}
if store == nil {
if store == nil || store.State == metapb.StoreState_Tombstone {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@HunDunDM question, do we need drop region when state be StoreState_Offline?

Copy link
Contributor

Choose a reason for hiding this comment

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

store == nil means the store is a tombstone. If the store doesn't exist, pdClient.GetStore() returns an error: https://github.com/tikv/pd/blob/bc63de897afa69cfcc5828f45431fe3999fed4b3/client/client.go#L1159-L1168

@ichn-hu ichn-hu mentioned this pull request Feb 24, 2021
Closed
@coocood
Copy link
Member

coocood commented Feb 24, 2021

LGTM

@ti-chi-bot
Copy link
Member

@coocood: 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.

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.

@coocood
Copy link
Member

coocood commented Feb 24, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 24, 2021
@tiancaiamao tiancaiamao self-requested a review March 2, 2021 14:34
@tiancaiamao
Copy link
Contributor

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • coocood
  • tiancaiamao

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.

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 Mar 3, 2021
@tiancaiamao
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@tiancaiamao: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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
Copy link
Member

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

Commit hash: 789d775

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

cherry pick to release-3.0 failed

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 3, 2021
@lysu @ti-srebot
cherry pick pingcap#22909 to release-4.0
f7e99ba 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 3, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #23071

@ti-srebot
Copy link
Contributor

cherry pick to release-5.0-rc failed

@glorv glorv mentioned this pull request Mar 3, 2021
Closed
ti-chi-bot pushed a commit that referenced this pull request Mar 15, 2021
@ti-srebot
tikv: drop store's regions when resolve store with tombstone status (#…
b848a5d 
…22909) (#23071)
This was referenced Mar 31, 2021
Merged
Merged
@ti-srebot ti-srebot mentioned this pull request Mar 31, 2021
Merged
@leiysky leiysky mentioned this pull request Apr 1, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@youjiali1995 youjiali1995 youjiali1995 left review comments

@coocood coocood Awaiting requested review from coocood

@MyonKeminta MyonKeminta Awaiting requested review from MyonKeminta

@HunDunDM HunDunDM Awaiting requested review from HunDunDM

@tiancaiamao tiancaiamao Awaiting requested review from tiancaiamao

Assignees
No one assigned
Labels
sig/transaction SIG:Transaction size/M Denotes a PR that changes 30-99 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/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Successive StoreNotMatch errors after add new store with tombstone store's IP
6 participants
@lysu @coocood @ti-chi-bot @tiancaiamao @ti-srebot @youjiali1995