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

Implementing Flexible Raft with NWR #1017

Merged
merged 102 commits into from
Oct 30, 2023
Merged

Implementing Flexible Raft with NWR #1017

merged 102 commits into from
Oct 30, 2023

Conversation

1294566108
Copy link
Contributor

@1294566108 1294566108 commented Jul 26, 2023 •
edited
Loading

Motivation:

  1. 结合 Quorum NWR 模型实现 Flexible Raft
  2. 为Flexible Raft添加 resetfactor API，用于动态调节factor大小

Modification:

Implementing Flexible Raft with Quorum NWR Model
Add ResetFactor API for flexible raft

Result:

Feature #1003 .

1294566108 and others added 23 commits April 9, 2023 14:21
@1294566108
feat(iterator):Auto commit mode for applying log iterator
214ec93
@1294566108
feat(iterator):Auto commit mode for applying log iterator
8ed148d
@1294566108
feat(iterator):Correction parameter name
21ac53a
@1294566108
feat(iterator):mvn compile
e5d9986
@1294566108
feat(iterator):Modify comments and annotations
8cdff52
@1294566108
feat(iterator):Modify comments
88a6ce2
@1294566108
feat(iterator):Modify comments
535d876
@1294566108
feat(rfcs):Add rfcs for Flexible-Raft-with-NWR
9034f71
@1294566108
Merge branch 'sofastack:master' into master
fce77c4
@1294566108
feat(rfcs):Add stepDown change logic and modify parameter name for rfcs
9e6a785
@1294566108
Merge remote-tracking branch 'origin/master'
9d14232
@1294566108
feat(rfcs):Modify factor calculation rules for rfcs
ffd2136
@1294566108
feat(rfcs):Modify some language expressions
9eec73b
@1294566108
feat(rfcs):Implementing Flexible Raft with NWR
0e75dbb
@1294566108
feat(rfcs):compile project
f9e766f
@1294566108
Merge remote-tracking branch 'origin/master'
e7d657a 
# Conflicts:
#	jraft-core/src/main/java/com/alipay/sofa/jraft/Quorum.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/core/BallotBox.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/entity/MajorityQuorum.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/entity/NWRQuorum.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/entity/QuorumConfiguration.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/entity/QuorumFactory.java
#	jraft-core/src/main/java/com/alipay/sofa/jraft/option/NodeOptions.java
#	jraft-core/src/test/java/com/alipay/sofa/jraft/entity/NWRQuorumTest.java
@1294566108
feat(rfcs):compile project
c4fd678
@1294566108
feat(rfcs):Remove useless and redundant code
46f95f1
@1294566108
feat(rfcs):Add rfcs
11311de
@1294566108
feat(flexible):add flexible mode fot Jraft
5ed30b6
@1294566108
feat(flexible):Modify rfc doc
f1c3647
@1294566108
feat(flexible):Modify quorum code design
5d5dddc
@1294566108
feat(factor):Add ResetFactor API
fdd1aca
@shihuili1218
Copy link
Collaborator

代码都提交了吗？

@1294566108
Copy link
Contributor Author

代码都提交了吗？

目前是最新的代码

@1294566108 1294566108 changed the title Add ResetFactor API for flexible raft Implementing Flexible Raft with NWR Sep 25, 2023
@shihuili1218
Copy link
Collaborator

@killme2008 look good for me. pls take the time to review again

@killme2008
Copy link
Contributor

@killme2008 look good for me. pls take the time to review again

Cool!
Sorry, I don't have time these days, I will review it this weekend ASAP.

@shihuili1218
Copy link
Collaborator

@killme2008 look good for me. pls take the time to review again

Cool! Sorry, I don't have time these days, I will review it this weekend ASAP.

Hi @killme2008 , I'd like to check on the progress of this PR's review. by the way, the deadline for OSPP is October 30th, and we need to ensure timely consolidation.[皱眉]

@fengjiachun fengjiachun changed the base branch from master to develop October 27, 2023 07:30
@shihuili1218
Copy link
Collaborator

shihuili1218 commented Oct 27, 2023 •
edited
Loading

@1294566108 补充一下jepsen的验证结果呗。你可以在sofa-jraft-jepsen中创建pr，在这引用。后续可以关闭jepsen的pr

@1294566108
Copy link
Contributor Author

@1294566108补充一下jepsen的结果呗。你可以在sofa-jraft-jepsen中创建pr，在这引用。后续可以验证关闭jepsen的pr

已上传PR到sofa-jraft-jepsen仓库：sofastack/sofa-jraft-jepsen#3

fengjiachun
fengjiachun reviewed Oct 28, 2023
View reviewed changes
jraft-core/src/main/java/com/alipay/sofa/jraft/core/CliServiceImpl.java Outdated Show resolved Hide resolved
jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java Outdated Show resolved Hide resolved
jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java Outdated Show resolved Hide resolved
jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java Show resolved Hide resolved
jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java Outdated Show resolved Hide resolved
jraft-core/src/main/java/com/alipay/sofa/jraft/entity/codec/v1/V1Encoder.java Outdated Show resolved Hide resolved
jraft-example/src/main/resources/flexible_counter.proto Outdated Show resolved Hide resolved
jraft-core/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java Outdated Show resolved Hide resolved
jraft-core/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java Outdated Show resolved Hide resolved
jraft-example/src/main/java/com/alipay/sofa/jraft/example/counter/rpc/CounterOutter.java Outdated Show resolved Hide resolved
@1294566108
Copy link
Contributor Author

@fengjiachun Hi, the problem seems to have been resolved, could you please see if it is possible to merge

@fengjiachun
Copy link
Contributor

LGTM

@fengjiachun fengjiachun merged commit 49d8842 into sofastack:develop Oct 30, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shihuili1218 shihuili1218 shihuili1218 left review comments

@fengjiachun fengjiachun fengjiachun left review comments

Assignees
No one assigned
Labels
cla:yes size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[OSPP开源之夏] 结合 NWR 实现 Flexible raft，用于自定义 Quorum 的大小
4 participants
@1294566108 @shihuili1218 @killme2008 @fengjiachun