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

checker: replace down check with disconnect check when fixing orphan peer #7294

Merged
merged 4 commits into from
Nov 3, 2023

Conversation

lhy1024
Copy link
Contributor

@lhy1024 lhy1024 commented Nov 1, 2023

What problem does this PR solve?

Issue Number: Close #7249

What is changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Release note

None.

Signed-off-by: lhy1024 <admin@liudos.us>
Copy link
Contributor

ti-chi-bot bot commented Nov 1, 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.

Copy link
Contributor

ti-chi-bot bot commented Nov 1, 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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 1, 2023
ruleCheckerRemoveOrphanPeerCounter.Inc()
return operator.CreateRemovePeerOperator("remove-orphan-peer", c.cluster, 0, region, orphanPeer.StoreId)
checkerCounter.WithLabelValues("rule_checker", "remove-orphan-peer").Inc()
return operator.CreateRemovePeerOperator("remove-unhealthy-orphan-peer", c.cluster, 0, region, orphanPeer.StoreId)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

use "remove-unhealthy-orphan-peer" and "remove-disconnected-orphan-peer" to distinguish

// down peer's store should be down.
if !c.isStoreDownTimeHitMaxDownTime(pinDownPeer.GetStoreId()) {
// down peer's store should be disconnected
if !isDisconnectedPeer(pinDownPeer) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

use isDisconnectedPeer rather than isStoreDownTimeHitMaxDownTime, because we use stricter check in isDisconnectedPeer

Copy link

codecov bot commented Nov 1, 2023

Codecov Report

Merging #7294 (c551263) into master (01fb56b) will decrease coverage by 0.02%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #7294      +/-   ##
==========================================
- Coverage   74.48%   74.46%   -0.02%     
==========================================
  Files         446      446              
  Lines       48339    48346       +7     
==========================================
- Hits        36003    36001       -2     
- Misses       9161     9167       +6     
- Partials     3175     3178       +3     
Flag Coverage Δ
unittests 74.46% <100.00%> (-0.02%) ⬇️

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

Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 changed the title checker: replace down check with disconnect check checker: replace down check with disconnect check when fixxing orphan peer Nov 1, 2023
@lhy1024 lhy1024 changed the title checker: replace down check with disconnect check when fixxing orphan peer checker: replace down check with disconnect check when fixing orphan peer Nov 1, 2023
Signed-off-by: lhy1024 <admin@liudos.us>
@lhy1024 lhy1024 marked this pull request as ready for review November 2, 2023 03:09
@ti-chi-bot ti-chi-bot bot removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-linked-issue labels Nov 2, 2023
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 Nov 2, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 2, 2023

@nolouch ptal

@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 Nov 3, 2023
@lhy1024
Copy link
Contributor Author

lhy1024 commented Nov 3, 2023

/merge

Copy link
Contributor

ti-chi-bot bot commented Nov 3, 2023

@lhy1024: 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.

Copy link
Contributor

ti-chi-bot bot commented Nov 3, 2023

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

Commit hash: 4f1c5cb

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 3, 2023
@ti-chi-bot ti-chi-bot bot merged commit 689fcbe into tikv:master Nov 3, 2023
26 checks passed
@lhy1024 lhy1024 deleted the fix-check2 branch November 3, 2023 02:12
lhy1024 added a commit to lhy1024/pd that referenced this pull request Nov 3, 2023
…peer (tikv#7294)

close tikv#7249

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: lhy1024 <admin@liudos.us>
ti-chi-bot bot pushed a commit that referenced this pull request Nov 6, 2023
…peer(#7294) (#7295)

close #7249

Signed-off-by: lhy1024 <admin@liudos.us>
lhy1024 added a commit to lhy1024/pd that referenced this pull request Nov 8, 2023
…peer (tikv#7294)

close tikv#7249

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
lhy1024 added a commit to lhy1024/pd that referenced this pull request Nov 8, 2023
…peer (tikv#7294)

close tikv#7249

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
lhy1024 added a commit to lhy1024/pd that referenced this pull request Nov 8, 2023
…peer (tikv#7294)

close tikv#7249

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
lhy1024 added a commit to lhy1024/pd that referenced this pull request Nov 8, 2023
…peer (tikv#7294)

close tikv#7249

Signed-off-by: lhy1024 <admin@liudos.us>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Signed-off-by: lhy1024 <admin@liudos.us>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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.

checker: reduces the probability of deleting normal peers when the store becomes unavailable
3 participants