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

server: existing statistics will not be deleted when putting store && check when store status changing (#3200) #3206

Merged
merged 3 commits into from
Nov 26, 2020
Merged

server: existing statistics will not be deleted when putting store && check when store status changing (#3200) #3206

merged 3 commits into from
Nov 26, 2020

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Nov 24, 2020 •
edited by HunDunDM
Loading

cherry-pick #3200 to release-4.0

Signed-off-by: Zheng Xiangsheng hundundm@gmail.com

What problem does this PR solve?

  • When changing a Tombstone store to Up or Offline, if the cluster-version has been upgraded at this time, the operation should fail.
  • When TiKV restarts, it will PutStore. This operation currently deletes existing statistics and store-limit.

What is changed and how it works?

  • The store of lower version is no longer allowed to change from Tombstone back to Up.
  • Fix the bug that restarting the store will cause store-limit and statistics to be reset.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • The store of lower version is no longer allowed to change from Tombstone back to Up.
  • Fix the bug that restarting the store will cause store-limit and statistics to be reset.

@HunDunDM @ti-srebot
cherry pick tikv#3200 to release-4.0
57570ca 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Nov 24, 2020
Merged
@ti-srebot ti-srebot added component/api HTTP API. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick labels Nov 24, 2020
@ti-srebot ti-srebot added this to the v4.0.9 milestone Nov 24, 2020
@ti-srebot
Copy link
Contributor Author

@HunDunDM you're already a collaborator in bot's repo.

@nolouch
Copy link
Contributor

nolouch commented Nov 25, 2020

@HunDunDM, please resolve the conflict.

@HunDunDM
resolve conflict
5f16bf4 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
Copy link
Member

/run-all-tests

@HunDunDM
Copy link
Member

/run-integration-common-test
/run-integration-compatibility-test

@HunDunDM
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

/run-all-tests

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 tidb-community-bots/ti-community-prow repository.

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 25, 2020
@ti-chi-bot
Copy link
Member

Can merge label has been added.

Git tree hash: 5f16bf4

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR has out-of-dated and I have automatically updated it for you.
At the same time I will also trigger all tests for you:

/run-all-tests

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 tidb-community-bots/ti-community-prow repository.

@nolouch
Copy link
Contributor

nolouch commented Nov 25, 2020

/rebuid

@Rustin170506
Copy link
Member

/run-all-tests

@nolouch
Copy link
Contributor

nolouch commented Nov 26, 2020

/run-integration-compatibility-test

@nolouch
Copy link
Contributor

nolouch commented Nov 26, 2020

/run-test

@nolouch
Copy link
Contributor

nolouch commented Nov 26, 2020

/rebuild

@ti-chi-bot ti-chi-bot merged commit 226bd72 into tikv:release-4.0 Nov 26, 2020
@HunDunDM HunDunDM changed the title server: check the store version when changing tombstone status (#3200) server: existing statistics will not be deleted when putting store && check when store status changing (#3200) Nov 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@nolouch nolouch nolouch approved these changes

@rleungx rleungx Awaiting requested review from rleungx

@disksing disksing Awaiting requested review from disksing

Assignees

@HunDunDM HunDunDM

Labels
component/api HTTP API. 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
v4.0.9
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-srebot @nolouch @HunDunDM @ti-chi-bot @Rustin170506 @lhy1024