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

unsafe recovery: Fixing learner store being ignored error in 7.1 #6744

Merged
merged 2 commits into from
Jul 5, 2023

Conversation

v01dstar
Copy link
Contributor

@v01dstar v01dstar commented Jul 3, 2023

What problem does this PR solve?

Issue Number: Ref #6690

What is changed and how does it work?

Fix learner store/ replica being ignored error in auto detect mode.

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

Release note

None.

Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 3, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Connor1996
  • 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 bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 3, 2023
@v01dstar v01dstar changed the base branch from master to release-7.1 July 3, 2023 23:34
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 3, 2023
@ti-chi-bot ti-chi-bot bot requested review from nolouch and rleungx July 3, 2023 23:34
@v01dstar
Copy link
Contributor Author

v01dstar commented Jul 3, 2023

/cc @Connor1996

@ti-chi-bot ti-chi-bot bot requested a review from Connor1996 July 3, 2023 23:39
Copy link
Member

@Connor1996 Connor1996 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 ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 3, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 4, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 4, 2023
@nolouch
Copy link
Contributor

nolouch commented Jul 4, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 4, 2023

@nolouch: 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
Contributor

ti-chi-bot bot commented Jul 4, 2023

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

Commit hash: f1733d4

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 4, 2023
@codecov
Copy link

codecov bot commented Jul 5, 2023

Codecov Report

Patch coverage has no change and project coverage change: +0.07 🎉

Comparison is base (2164c07) 74.92% compared to head (275a55d) 75.00%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-7.1    #6744      +/-   ##
===============================================
+ Coverage        74.92%   75.00%   +0.07%     
===============================================
  Files              407      407              
  Lines            40754    40752       -2     
===============================================
+ Hits             30534    30565      +31     
+ Misses            7546     7526      -20     
+ Partials          2674     2661      -13     
Flag Coverage Δ
unittests 75.00% <ø> (+0.07%) ⬆️

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

Impacted Files Coverage Δ
server/cluster/unsafe_recovery_controller.go 82.90% <ø> (+0.28%) ⬆️

... and 39 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ti-chi-bot ti-chi-bot bot merged commit 9954576 into tikv:release-7.1 Jul 5, 2023
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #6762.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jul 5, 2023
ref tikv#6690, ref tikv#6710

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #6763.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: base branch (release-7.1) needs to differ from target branch (release-7.1).

@v01dstar v01dstar deleted the fix-unsafe-recovery-7.1 branch July 5, 2023 18:04
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note-none Denotes a PR that doesn't merit a release note. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants