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

online recovery: fix online recovery timeout mechanism (#6108) #6111

Closed
wants to merge 1 commit into from
Closed

online recovery: fix online recovery timeout mechanism (#6108) #6111

wants to merge 1 commit into from

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6108

What problem does this PR solve?

Issue Number: Close #6107

What is changed and how does it work?

fix online recovery timeout mechanism

Check List

Tests

  • Unit test

Release note

Fix the issue that online recovery timeout may not work as expected

@Connor1996 @ti-chi-bot
This is an automated cherry-pick of tikv#6108
b8b2d23 
close tikv#6107

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 8, 2023
Merged
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Mar 8, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024

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 do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Mar 8, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 8, 2023
lhy1024
lhy1024 reviewed Mar 8, 2023
View reviewed changes
server/cluster/unsafe_recovery_controller.go
return u.stage != idle && u.stage != finished && u.stage != failed
}

// RemoveFailedStores removes failed stores from the cluster.
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

plz fix conflict

@v01dstar v01dstar mentioned this pull request Mar 29, 2023
Merged
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 30, 2023
@rleungx
Copy link
Member

rleungx commented Mar 30, 2023

It's replaced by #6246.

@rleungx rleungx closed this Mar 30, 2023
ti-chi-bot added a commit that referenced this pull request Mar 30, 2023
@v01dstar @Connor1996 @ti-chi-bot
online recovery: fix online recovery timeout mechanism (#6108) (#6246)
8c09be1 
close #6107, ref #6108, ref #6111

fix online recovery timeout mechanism

Signed-off-by: Connor1996 <zbk602423539@gmail.com>
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>

Co-authored-by: Connor <zbk602423539@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
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

@HunDunDM HunDunDM Awaiting requested review from HunDunDM

@rleungx rleungx Awaiting requested review from rleungx

Assignees

@Connor1996 Connor1996

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @rleungx @lhy1024 @VelocityLight @Connor1996