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.

Sign up for GitHub

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

Jump to bottom

Modify placement rule to support witness #5292

Merged
merged 28 commits into from
Oct 20, 2022
Merged

Modify placement rule to support witness #5292

merged 28 commits into from
Oct 20, 2022

Conversation

ethercflow
Copy link
Member

@ethercflow ethercflow commented Jul 10, 2022 •
edited
Loading

Signed-off-by: Wenbo Zhang ethercflow@gmail.com

What problem does this PR solve?

Issue Number: Close #5568

What is changed and how does it work?

Modify placement rule to support witness

Check List

Tests

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

Code changes

  • rule checker

Side effects

  • Increased code complexity

Related changes

Release note

Modify placement rule to support witness

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 10, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • rleungx

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 added do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 10, 2022
@Connor1996 Connor1996 mentioned this pull request Jul 11, 2022
Open
38 tasks
JmPotato
JmPotato reviewed Jul 11, 2022
View reviewed changes
server/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved
server/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved
rleungx
rleungx reviewed Jul 12, 2022
View reviewed changes
server/core/peer.go Outdated Show resolved Hide resolved
server/schedule/checker/rule_checker_test.go Show resolved Hide resolved
server/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved
JmPotato
JmPotato reviewed Jul 13, 2022
View reviewed changes
server/core/peer.go Show resolved Hide resolved
server/core/peer.go Show resolved Hide resolved
server/schedule/checker/rule_checker.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 27, 2022
@ethercflow
Modify placement rule to support witness
137628a 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
Add testcase: TestFixRuleWitness
4498151 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
Fix a few bugs
05b52cc 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
define CreateNonWitnessVoterOperator
fa3e1f0 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
improve witness operations
82d3f7f 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
Fix panic caused by nil pointer
e9b8e74 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
support for converting witnesses to non-witness
965eb2d 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
demote voter before change to non-witness
2b96719 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
fix losing witness field
2336fdd 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
update kvproto
76dab62 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
fix non-witness operator
5f02c4c 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
promote witness when voter down or pending
5fae5e6 
Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
rebase with latest master
0a49662 
ref tikv/tikv#12876

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@rleungx
Copy link
Member

rleungx commented Oct 13, 2022

Will the merge operation be considered in the next PR?

@ethercflow
Copy link
Member Author

Will the merge operation be considered in the next PR?

Yes，I think put it in another PR is better.

Connor1996
Connor1996 reviewed Oct 17, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
Connor1996
Connor1996 reviewed Oct 17, 2022
View reviewed changes
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 overall. Leave for @rleungx to give a approval

@ethercflow
add a few tests and address comments
aae3f16 
ref tikv#5568

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
add one testcase
d19a8e3 
ref tikv#5568

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
Merge branch 'master' into support-witness
437b1a6
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 18, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2022
rleungx
rleungx reviewed Oct 20, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@ethercflow
fix dep log version
d6c5982 
ref tikv#5568

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
fix dep log version
d63a15f 
ref tikv#5568

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ethercflow
remove logic for handling down peers
5148ea8 
ref tikv#5568

Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Oct 20, 2022
@Connor1996
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

@Connor1996: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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
Member

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

Commit hash: 5148ea8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 20, 2022
@ti-chi-bot ti-chi-bot merged commit 1a485f7 into tikv:master Oct 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Connor1996 Connor1996 Connor1996 left review comments

@rleungx rleungx rleungx approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Modify placement rule to support witness
5 participants
@ethercflow @ti-chi-bot @rleungx @Connor1996 @JmPotato