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: Fix learner nodes got ignored in auto detect mode error #6691

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

v01dstar
Copy link
Contributor

@v01dstar v01dstar commented Jun 27, 2023

What problem does this PR solve?

Issue Number: Close #6690

What is changed and how does it work?

Fix learner nodes got ignored in auto detect mode error

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

This PR does not need to be cherry-picked into release 6.5, since the customized PR #6683 will be.

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 27, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Connor1996
  • disksing

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.

@v01dstar
Copy link
Contributor Author

/cc @Connor1996

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

codecov bot commented Jun 27, 2023

Codecov Report

Patch coverage: 56.71% and project coverage change: -0.06 ⚠️

Comparison is base (753fb1c) 74.59% compared to head (1414baf) 74.54%.

❗ Current head 1414baf differs from pull request most recent head 7fdefb7. Consider uploading reports for the commit 7fdefb7 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6691      +/-   ##
==========================================
- Coverage   74.59%   74.54%   -0.06%     
==========================================
  Files         416      416              
  Lines       43543    43541       -2     
==========================================
- Hits        32482    32458      -24     
- Misses       8180     8195      +15     
- Partials     2881     2888       +7     
Flag Coverage Δ
unittests 74.54% <56.71%> (-0.06%) ⬇️

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

Impacted Files Coverage Δ
client/grpcutil/grpcutil.go 74.19% <ø> (ø)
client/tso_client.go 78.09% <ø> (ø)
pkg/schedule/schedulers/split_bucket.go 37.75% <ø> (ø)
pkg/unsaferecovery/unsafe_recovery_controller.go 82.31% <ø> (-0.40%) ⬇️
...ols/pd-ctl/pdctl/command/keyspace_group_command.go 55.93% <20.00%> (ø)
pkg/keyspace/keyspace.go 62.47% <33.33%> (ø)
pkg/keyspace/tso_keyspace_group.go 71.92% <45.31%> (-1.47%) ⬇️
client/tso_dispatcher.go 79.85% <57.14%> (-1.64%) ⬇️
pkg/keyspace/util.go 86.81% <60.00%> (ø)
pkg/schedule/operator/operator_controller.go 86.17% <88.88%> (+0.43%) ⬆️
... and 5 more

... and 33 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.

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

pkg/unsaferecovery/unsafe_recovery_controller_test.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 27, 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 Jun 28, 2023
@disksing
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 28, 2023

@disksing: 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 Jun 28, 2023

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

Commit hash: 8dcab64

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 28, 2023
Signed-off-by: Yang Zhang <yang.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot bot removed status/can-merge Indicates a PR has been approved by a committer. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 28, 2023
@ti-chi-bot ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 28, 2023
@Connor1996
Copy link
Member

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Jun 29, 2023

@Connor1996: 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 Jun 29, 2023

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

Commit hash: 1414baf

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

ti-chi-bot bot commented Jun 29, 2023

@v01dstar: Your PR was out of date, I have automatically updated it for you.

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.

@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 29, 2023
@ti-chi-bot ti-chi-bot bot merged commit 610aee7 into tikv:master Jun 29, 2023
22 checks passed
@ti-chi-bot
Copy link
Member

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

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
Copy link
Member

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

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
Copy link
Member

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

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>
@v01dstar v01dstar deleted the fix-unsafe-recovery branch June 29, 2023 07:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.1 needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.1 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.

Unsafe recovery hang in auto detect mode.
4 participants