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.

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

schedulers: rollback the scheduler when failing to persist (#3787) #3824

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3787

What problem does this PR solve?

Try to fix #2572.

What is changed and how it works?

This PR corrects the status code and rollback the scheduler when failing to persist.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix the issue that the scheduler may appear again even if we have already executed the delete operation

Signed-off-by: Ryan Leung <rleungx@gmail.com>
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. component/scheduler Scheduler logic. type/cherry-pick-for-release-5.1 The PR belongs to release-5.1 cherry pick. labels Jun 30, 2021
@codecov
Copy link

codecov bot commented Jun 30, 2021

Codecov Report

Merging #3824 (81bc6cd) into release-5.1 (b5077f0) will increase coverage by 0.17%.
The diff coverage is 67.30%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-5.1    #3824      +/-   ##
===============================================
+ Coverage        74.95%   75.12%   +0.17%     
===============================================
  Files              245      245              
  Lines            24539    24555      +16     
===============================================
+ Hits             18394    18448      +54     
+ Misses            4515     4488      -27     
+ Partials          1630     1619      -11     
Flag Coverage Δ
unittests 75.12% <67.30%> (+0.17%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
server/schedulers/hot_region.go 83.93% <0.00%> (-0.72%) ⬇️
server/api/scheduler.go 45.40% <42.85%> (+0.76%) ⬆️
server/schedulers/grant_leader.go 66.66% <50.00%> (-1.69%) ⬇️
server/cluster/coordinator.go 74.75% <66.66%> (+1.61%) ⬆️
server/schedulers/evict_leader.go 74.37% <88.88%> (+5.86%) ⬆️
server/config/persist_options.go 91.50% <100.00%> (+0.09%) ⬆️
server/schedule/region_scatterer.go 83.87% <0.00%> (-4.61%) ⬇️
server/statistics/hot_cache_task.go 75.00% <0.00%> (-4.17%) ⬇️
pkg/dashboard/adapter/manager.go 79.78% <0.00%> (-3.20%) ⬇️
server/encryptionkm/key_manager.go 71.78% <0.00%> (-1.66%) ⬇️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d8c1f30...81bc6cd. Read the comment docs.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 5, 2021
@HunDunDM HunDunDM added this to the v5.1.1 milestone Jul 18, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 19, 2021
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HunDunDM
  • nolouch

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@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 Jul 23, 2021
@nolouch
Copy link
Contributor

nolouch commented Jul 23, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@nolouch: 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 ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member Author

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

Commit hash: a86a14f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 23, 2021
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: 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.

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.

@HunDunDM
Copy link
Member

/rebuild

@ti-chi-bot ti-chi-bot merged commit 7cba191 into tikv:release-5.1 Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-5.1.1 cherry-pick-approved Cherry pick PR approved by release team. component/scheduler Scheduler logic. release-note Denotes a PR that will be considered when it comes time to generate release notes. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.1 The PR belongs to release-5.1 cherry pick.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants