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 #6683

Merged
merged 5 commits into from
Jul 4, 2023

Conversation

v01dstar
Copy link
Contributor

@v01dstar v01dstar commented Jun 26, 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

Cherry-pick PR proposed by Ti-Chi bot with merge conflicts #6709

Release note

None.

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

ti-chi-bot bot commented Jun 26, 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
Copy link
Contributor

ti-chi-bot bot commented Jun 26, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@ti-chi-bot ti-chi-bot bot added release-note-none do-not-merge/cherry-pick-not-approved do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 26, 2023
@ti-chi-bot ti-chi-bot bot requested review from JmPotato and Yisaer June 26, 2023 20:20
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 26, 2023
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 26, 2023
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@v01dstar v01dstar changed the title Add info log when scheduling is disabled unsafe recovery: Fixing learner store being ignored error Jun 27, 2023
@v01dstar v01dstar marked this pull request as ready for review June 27, 2023 02:06
@ti-chi-bot ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 27, 2023
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@v01dstar
Copy link
Contributor Author

/cc @Connor1996

@ti-chi-bot ti-chi-bot bot requested a review from Connor1996 June 27, 2023 02:10
@codecov
Copy link

codecov bot commented Jun 27, 2023

Codecov Report

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

Comparison is base (cfdcdff) 75.64% compared to head (1d96027) 75.66%.

Additional details and impacted files
@@               Coverage Diff               @@
##           release-6.5    #6683      +/-   ##
===============================================
+ Coverage        75.64%   75.66%   +0.01%     
===============================================
  Files              330      330              
  Lines            33122    33120       -2     
===============================================
+ Hits             25055    25060       +5     
+ Misses            5917     5906      -11     
- Partials          2150     2154       +4     
Flag Coverage Δ
unittests 75.66% <ø> (+0.01%) ⬆️

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.56% <ø> (-0.06%) ⬇️

... and 25 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 bot added a commit that referenced this pull request Jun 29, 2023
…ror (#6691)

ref #6683, close #6690

Fix learner nodes got ignored in auto detect mode error

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jun 29, 2023
ref tikv#6683, close tikv#6690

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jun 29, 2023
…ror (tikv#6691)

ref tikv#6683, close tikv#6690

Fix learner nodes got ignored in auto detect mode error

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Jun 29, 2023
…ror (tikv#6691)

ref tikv#6683, close tikv#6690

Fix learner nodes got ignored in auto detect mode error

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

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
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 Jun 30, 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
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 4, 2023
@JmPotato
Copy link
Member

JmPotato commented Jul 4, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jul 4, 2023

@JmPotato: 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: cd89f38

@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
@ti-chi-bot ti-chi-bot bot merged commit 15324c5 into tikv:release-6.5 Jul 4, 2023
19 checks passed
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. release-note-none 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.

None yet

5 participants