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

replication mode: fix wrong available store list #7222

Merged
merged 4 commits into from
Oct 18, 2023

Conversation

disksing
Copy link
Contributor

@disksing disksing commented Oct 18, 2023

What problem does this PR solve?

Issue Number: Close #7221 #7218

What is changed and how does it work?

As now canSync and hasMajority are calculated using placement rules, we can contain stores that have only learners in avalable stores list.

This PR also fix a minor bug that relates to available stores id comparsion.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

None.

fix tikv#7221

Signed-off-by: disksing <i@disksing.com>
@disksing disksing added type/bugfix This PR fixes a bug. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Oct 18, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 18, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lhy1024
  • 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 do-not-merge/needs-triage-completed 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. labels Oct 18, 2023
Signed-off-by: disksing <i@disksing.com>
Signed-off-by: disksing <i@disksing.com>
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 18, 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 Oct 18, 2023
Copy link
Member

@CabinfeverB CabinfeverB left a comment

Choose a reason for hiding this comment

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

rest LGTM

Signed-off-by: disksing <i@disksing.com>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 18, 2023
@codecov
Copy link

codecov bot commented Oct 18, 2023

Codecov Report

Merging #7222 (ed860a2) into master (8b2896b) will decrease coverage by 0.20%.
Report is 2 commits behind head on master.
The diff coverage is 27.66%.

@@            Coverage Diff             @@
##           master    #7222      +/-   ##
==========================================
- Coverage   74.65%   74.45%   -0.20%     
==========================================
  Files         442      442              
  Lines       47744    47897     +153     
==========================================
+ Hits        35642    35661      +19     
- Misses       8957     9086     +129     
- Partials     3145     3150       +5     
Flag Coverage Δ
unittests 74.45% <27.66%> (-0.20%) ⬇️

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

@disksing
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 18, 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 Oct 18, 2023

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

Commit hash: ed860a2

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 18, 2023
@ti-chi-bot ti-chi-bot bot merged commit cb9c70c into tikv:master Oct 18, 2023
24 of 26 checks passed
@ti-chi-bot
Copy link
Member

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

@disksing disksing deleted the disksing/replication3 branch October 18, 2023 07:21
ti-chi-bot bot pushed a commit that referenced this pull request Oct 18, 2023
close #7221

Signed-off-by: disksing <i@disksing.com>

Co-authored-by: disksing <i@disksing.com>
disksing added a commit to oh-my-tidb/pd that referenced this pull request Oct 30, 2023
close tikv#7221

Signed-off-by: disksing <i@disksing.com>

Co-authored-by: disksing <i@disksing.com>
@lhy1024 lhy1024 added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Nov 8, 2023
@ti-chi-bot
Copy link
Member

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

ti-chi-bot bot pushed a commit that referenced this pull request Nov 8, 2023
close #7221

Signed-off-by: disksing <i@disksing.com>

Co-authored-by: disksing <i@disksing.com>
@lhy1024 lhy1024 added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Feb 1, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Feb 1, 2024
close tikv#7221

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
disksing added a commit to oh-my-tidb/pd that referenced this pull request Feb 1, 2024
close tikv#7221

Signed-off-by: disksing <i@disksing.com>

Co-authored-by: disksing <i@disksing.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. 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. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

replication mode: available_stores is wrongly calculated
5 participants