Skip to content

RATIS-1912. Fix infinity election when perform membership change. - #954

Merged
szetszwo merged 10 commits into
apache:masterfrom
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged

RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom
wojiaodoubao:RATIS-1912

Conversation

@wojiaodoubao

@wojiaodoubaowojiaodoubao commented Oct 27, 2023

Copy link
Copy Markdown
Contributor

What changes were proposed in this pull request?

This patch resolves a membership change bug. See detail in #943.

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/RATIS-1912

How was this patch tested?

unit tests

@wojiaodoubaowojiaodoubao changed the title Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao mentioned this pull request Oct 27, 2023
Closed
@wojiaodoubao

wojiaodoubao commented Oct 31, 2023

Copy link
Copy Markdown
ContributorAuthor

Hi @szetszwo, could you kindly help to take a review when you have time, thanks.

@SzyWilliamSzyWilliam changed the title Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo reviewed Nov 1, 2023
View reviewed changes

@szetszwoszetszwo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java Outdated
return logAndReturn(phase, Result.PASSED, responses, exceptions);
} else if (singleMode) {
// if candidate is in single mode, candidate pass vote.
return logAndReturn(phase, Result.PASSED, responses, exceptions);

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java Outdated
if (conf.hasMajority(votedPeers, server.getId())) {
return logAndReturn(phase, Result.PASSED, responses, exceptions);
} else if (singleMode) {
return logAndReturn(phase, Result.PASSED, responses, exceptions);

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java Outdated
* changing from single mode to HA mode.
*/
boolean changeMajority(Collection<RaftPeer> newMembers) {
Preconditions.assertNull(oldConf, "Conf must be stable.");

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java Outdated
}
// If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
// election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.

finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java Outdated
Comment on lines +263 to +264
return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
selfId);

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java Outdated
pending.setReply(newSuccessReply(request));
return pending.getFuture();
}
if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java Outdated
}

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.

Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java Outdated
Comment on lines +395 to +398
@VisibleForTesting
void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
getImpl(groupId).getState().setRaftConf(conf);
}

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.

//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}

Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java Outdated
.build();
Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
leaderServer.setRaftConf(groupId, oldNewConf);
leaderServer.triggerElection(groupId);

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.

try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}

Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java Outdated
leaderServer.setRaftConf(groupId, oldNewConf);
leaderServer.triggerElection(groupId);

RaftTestUtil.waitForLeader(cluster);

@szetszwoszetszwoNov 1, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Check new leader and new conf:

finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());

@wojiaodoubao

wojiaodoubao commented Nov 1, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.

szetszwo
szetszwo approved these changes Nov 1, 2023
View reviewed changes

@szetszwoszetszwo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

+1 the change looks good.

@szetszwo

szetszwo commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?

szetszwo
szetszwo reviewed Nov 2, 2023
View reviewed changes

@szetszwoszetszwo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?

Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java Outdated
Comment on lines +210 to +212
public interface ConsumerWithIOException {
void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
}

@szetszwoszetszwoNov 2, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.

publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {

@wojiaodoubao

wojiaodoubao commented Nov 3, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.

@wojiaodoubao

wojiaodoubao commented Nov 3, 2023

Copy link
Copy Markdown
ContributorAuthor

In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.

The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.

Every follower should try to install at least one snapshot during bootstrapping, if available.

The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.

@szetszwo
szetszwo merged commit c35f769 into apache:masterNov 3, 2023
@szetszwo

szetszwo commented Nov 3, 2023

Copy link
Copy Markdown
Contributor

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.

On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change

  • form 1-node to 3-node by one command

than

  • from 1-node to 2-node and 2-node to 3-node by two commands.

For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.

@wojiaodoubao , what do you think?

@szetszwo

szetszwo commented Nov 5, 2023

Copy link
Copy Markdown
Contributor

Filed RATIS-1930.

@wojiaodoubao

wojiaodoubao commented Nov 6, 2023

Copy link
Copy Markdown
ContributorAuthor

Thanks a lot for @szetszwo's kindly help.

On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change

  • form 1-node to 3-node by one command
    than
  • from 1-node to 2-node and 2-node to 3-node by two commands.

I totally agree.

symious pushed a commit to symious/ratis that referenced this pull request Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas mentioned this pull request Apr 24, 2024
Closed
RexXiong pushed a commit to apache/celeborn that referenced this pull request May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
RATIS-1912. Fix infinity election when perform membership change. by wojiaodoubao · Pull Request #954 · apache/ratis · GitHub
Skip to content
RATIS-1912. Fix infinity election when perform membership change. - #954
Merged
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Nov 3, 2023
Merged
RATIS-1912. Fix infinity election when perform membership change.#954
szetszwo merged 10 commits into
apache:masterfrom 
wojiaodoubao:RATIS-1912
Conversation
@wojiaodoubao
@wojiaodoubaowojiaodoubao
commented
Oct 27, 2023

Copy link


Copy Markdown

Contributor
What changes were proposed in this pull request?
This patch resolves a membership change bug. See detail in #943.
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/RATIS-1912
How was this patch tested?
unit tests
@wojiaodoubaowojiaodoubao
changed the title
Ratis 1912Fix infinity election when perform membership change.Oct 27, 2023
@wojiaodoubaowojiaodoubao
mentioned this pull request
Oct 27, 2023
 Closed

@wojiaodoubao
wojiaodoubao
commented
Oct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Hi @szetszwo, could you kindly help to take a review when you have time, thanks.
@SzyWilliamSzyWilliam
changed the title
Fix infinity election when perform membership change.RATIS-1912. Fix infinity election when perform membership change.Oct 31, 2023
szetszwo
szetszwo
reviewed
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks a lot for working not this! Please see the comments inlined and also https://issues.apache.org/jira/secure/attachment/13064049/954_review.patch
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 // if candidate is in single mode, candidate pass vote.
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Let's add a Result.SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
Outdated

 if (conf.hasMajority(votedPeers, server.getId())) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
 } else if (singleMode) {
 return logAndReturn(phase, Result.PASSED, responses, exceptions);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use SINGLE_MODE_PASSED.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 * changing from single mode to HA mode.
 */
 boolean changeMajority(Collection<RaftPeer> newMembers) {
 Preconditions.assertNull(oldConf, "Conf must be stable.");
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It expect to pass the name, i.e. Preconditions.assertNull(oldConf, "oldConf")
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated

 }
 // If newPeersCount reaches majority number of new conf size, the cluster may end with infinity
 // election. See https://issues.apache.org/jira/browse/RATIS-1912 for more details.
 return newPeersCount >= newMembers.size() / 2 + newMembers.size() % 2;
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It may be easier to understand to return newPeersCount >= oldPeersCount, i.e.
finallongoldPeersCount = newMembers.size() - newPeersCount;
returnnewPeersCount >= oldPeersCount;
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftConfigurationImpl.java
Outdated


Comment on lines

+263
 to 
+264

 return oldConf.size() == 1 && oldConf.contains(selfId) && conf.size() == 2 && conf.contains(
 selfId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Make it a single line (ratis uses 120 line width).
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
Outdated

 pending.setReply(newSuccessReply(request));
 return pending.getFuture();
 }
 if (arguments.getMode() != SetConfigurationRequest.Mode.SET_UNCONDITIONALLY
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Since it is not safe, let's don't allow it even for SET_UNCONDITIONALLY.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated

 }

private RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
public RaftServerImpl getImpl(RaftGroupId groupId) throws IOException {
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

The method is not used in this change. Let's keep it private.
Comment threadratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java
Outdated


Comment on lines

+395
 to 
+398

 @VisibleForTesting
 void setRaftConf(RaftGroupId groupId, RaftConfigurationImpl conf) throws IOException {
 getImpl(groupId).getState().setRaftConf(conf);
 }
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Move it to RaftServerTestUtil, i.e.
//RaftServerTestUtilpublicstaticvoidsetRaftConf(RaftServerproxy, RaftGroupIdgroupId, RaftConfigurationconf) {
((RaftServerImpl)getDivision(proxy, groupId)).getState().setRaftConf(conf);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 .build();
 Assert.assertTrue(oldNewConf.isSingleMode(curPeer.getId()));
 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use transferLeadership with null new leader and then remove the new triggerElection method.
try(RaftClientclient = cluster.createClient()) {
client.admin().transferLeadership(null, leaderServer.getId(), 10_000);
}
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
Outdated

 leaderServer.setRaftConf(groupId, oldNewConf);
 leaderServer.triggerElection(groupId);

 RaftTestUtil.waitForLeader(cluster);
@szetszwoszetszwoNov 1, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Check new leader and new conf:
finalRaftServer.DivisionnewLeader = RaftTestUtil.waitForLeader(cluster);
Assert.assertEquals(leaderServer.getId(), newLeader.getId());
Assert.assertEquals(oldNewConf, newLeader.getRaftConf());
@wojiaodoubao
wojiaodoubao
commented
Nov 1, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Thanks @szetszwo your nice comments ! Upload v0.7 to trigger workflow. Some unit tests will fail after v0.7. Waiting the workflow to tell me which are they.
szetszwo
szetszwo
approved these changes
Nov 1, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

+1 the change looks good.
@szetszwo
szetszwo
commented
Nov 1, 2023

Copy link


Copy Markdown

Contributor
@wojiaodoubao , there are quite a few tests need to be updated due the new restriction on setConf. Could you take a look?
szetszwo
szetszwo
reviewed
Nov 2, 2023
View reviewed changes
@szetszwoszetszwo
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

@wojiaodoubao , thanks for fixing the tests. All tests pass except for TestInstallSnapshotNotificationWithGrpc. Could you take a look?
Comment threadratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
Outdated


Comment on lines

+210
 to 
+212

 public interface ConsumerWithIOException {
 void accept(Collection<RaftPeer> peesToSetConf) throws IOException;
 }
@szetszwoszetszwoNov 2, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Use CheckedConsumer, i.e.
publicstaticvoidrunWithMinorityPeers(MiniRaftClustercluster, Collection<RaftPeer> peersInNewConf,
CheckedConsumer<Collection<RaftPeer>, IOException> consumer) throwsIOException {
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
The failed case is TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap. It expected 2 times of 'installSnapshot' after 'setConfiguration', but got 3 times. I failed to reproduce the failure on my local environment. Upload v0.9 based on CheckedConsumer. Re-trigger workflow to see whether the failed case occurs repeatedly.
@wojiaodoubao
wojiaodoubao
commented
Nov 3, 2023

Copy link


Copy Markdown

ContributorAuthor
In TestInstallSnapshotNotificationWithGrpc#testInstallSnapshotDuringBootstrap, the setConfiguration is separated into 2 rpc calls. Add peer s1 first, then peer s2.
The s2 will be notified twice of install snapshot event. I think it doesn't break the semantic of notifyInstallSnapshot. Let me quote from GrpcLogAppender#shouldNotifyToInstallSnapshot.
Every follower should try to install at least one snapshot during bootstrapping, if available.
The GrpcLogAppender keeps notifyInstallSnapshot to the bootstrapping follower again and again. So install snapshot twice does happen. Changing the assert condition to 2 <= numSnapshotRequests.get() should be fine.
@szetszwo
szetszwo
merged commit c35f769
into
apache:masterNov 3, 2023
@szetszwo
szetszwo
commented
Nov 3, 2023

Copy link


Copy Markdown

Contributor
Since it is not safe, let's don't allow it even for  SET_UNCONDITIONALLY.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
For changing from non-HA to HA, it usually is an one time thing and the admin will monitor it. The split brain problem can be ignored.
@wojiaodoubao , what do you think?
@szetszwo
szetszwo
commented
Nov 5, 2023

Copy link


Copy Markdown

Contributor
Filed RATIS-1930.
@wojiaodoubao
wojiaodoubao
commented
Nov 6, 2023

Copy link


Copy Markdown

ContributorAuthor
Thanks a lot for @szetszwo's kindly help.
On a second thought, it is good to have a server conf to enable/disable the restriction since it is more efficient to change
  • form 1-node to 3-node by one command
    
than
  • from 1-node to 2-node and 2-node to 3-node by two commands.
I totally agree.
symious pushed a commit
to symious/ratis
that referenced
this pull request
Mar 29, 2024
@wojiaodoubao@symious
RATIS-1912. Fix infinity election when perform membership change. (ap…
03daaf0
…ache#954)
@SteNicholasSteNicholas
mentioned this pull request
Apr 24, 2024
 Closed

RexXiong pushed a commit
to apache/celeborn
that referenced
this pull request
May 30, 2024
@SteNicholas@RexXiong
[CELEBORN-1400] Bump Ratis version from 2.5.1 to 3.0.1
2a57fab
### What changes were proposed in this pull request?
Bump Ratis version from 2.5.1 to 3.0.1. Address incompatible changes:
- RATIS-589. Eliminate buffer copying in SegmentedRaftLogOutputStream.(apache/ratis#964)
- RATIS-1677. Do not auto format RaftStorage in RECOVER.(apache/ratis#718)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
### Why are the changes needed?
Bump Ratis version from 2.5.1 to 3.0.1. Ratis has released v3.0.0, v3.0.1, which release note refers to [3.0.0](https://ratis.apache.org/post/3.0.0.html), [3.0.1](https://ratis.apache.org/post/3.0.1.html). The 3.0.x version include new features like pluggable metrics and lease read, etc, some improvements and bugfixes including:
- 3.0.0: Change list of ratis 3.0.0 In total, there are roughly 100 commits diffing from 2.5.1 including:
- Incompatible Changes
- RaftStorage Auto-Format
- RATIS-1677. Do not auto format RaftStorage in RECOVER. (apache/ratis#718)
- RATIS-1694. Fix the compatibility issue of RATIS-1677. (apache/ratis#731)
- RATIS-1871. Auto format RaftStorage when there is only one directory configured. (apache/ratis#903)
- Pluggable Ratis-Metrics (RATIS-1688)
- RATIS-1689. Remove the use of the thirdparty Gauge. (apache/ratis#728)
- RATIS-1692. Remove the use of the thirdparty Counter. (apache/ratis#732)
- RATIS-1693. Remove the use of the thirdparty Timer. (apache/ratis#734)
- RATIS-1703. Move MetricsReporting and JvmMetrics to impl. (apache/ratis#741)
- RATIS-1704. Fix SuppressWarnings(“VisibilityModifier”) in RatisMetrics. (apache/ratis#742)
- RATIS-1710. Refactor metrics api and implementation to separated modules. (apache/ratis#749)
- RATIS-1712. Add a dropwizard 3 implementation of ratis-metrics-api. (apache/ratis#751)
- RATIS-1391. Update library dropwizard.metrics version to 4.x (apache/ratis#632)
- RATIS-1601. Use the shaded dropwizard metrics and remove the dependency (apache/ratis#671)
- Streaming Protocol Change
- RATIS-1569. Move the asyncRpcApi.sendForward(..) call to the client side. (apache/ratis#635)
- New Features
- Leader Lease (RATIS-1864)
- RATIS-1865. Add leader lease bound ratio configuration (apache/ratis#897)
- RATIS-1866. Maintain leader lease after AppendEntries (apache/ratis#898)
- RATIS-1894. Implement ReadOnly based on leader lease (apache/ratis#925)
- RATIS-1882. Support read-after-write consistency (apache/ratis#913)
- StateMachine API
- RATIS-1874. Add notifyLeaderReady function in IStateMachine (apache/ratis#906)
- RATIS-1897. Make TransactionContext available in DataApi.write(..). (apache/ratis#930)
- New Configuration Properties
- RATIS-1862. Add the parameter whether to take Snapshot when stopping to adapt to different services (apache/ratis#896)
- RATIS-1930. Add a conf for enable/disable majority-add. (apache/ratis#961)
- RATIS-1918. Introduces parameters that separately control the shutdown of RaftServerProxy by JVMPauseMonitor. (apache/ratis#950)
- RATIS-1636. Support re-config ratis properties (apache/ratis#800)
- RATIS-1860. Add ratis-shell cmd to generate a new raft-meta.conf. (apache/ratis#901)
- Improvements & Bug Fixes
- Netty
- RATIS-1898. Netty should use EpollEventLoopGroup by default (apache/ratis#931)
- RATIS-1899. Use EpollEventLoopGroup for Netty Proxies (apache/ratis#932)
- RATIS-1921. Shared worker group in WorkerGroupGetter should be closed. (apache/ratis#955)
- RATIS-1923. Netty: atomic operations require side-effect-free functions. (apache/ratis#956)
- RaftServer
- RATIS-1924. Increase the default of raft.server.log.segment.size.max. (apache/ratis#957)
- RATIS-1892. Unify the lifetime of the RaftServerProxy thread pool (apache/ratis#923)
- RATIS-1889. NoSuchMethodError: RaftServerMetricsImpl.addNumPendingRequestsGauge apache/ratis#922 (apache/ratis#922)
- RATIS-761. Handle writeStateMachineData failure in leader. (apache/ratis#927)
- RATIS-1902. The snapshot index is set incorrectly in InstallSnapshotReplyProto. (apache/ratis#933)
- RATIS-1912. Fix infinity election when perform membership change. (apache/ratis#954)
- RATIS-1858. Follower keeps logging first election timeout. (apache/ratis#894)
- 3.0.1:This is a bugfix release. See the [changes between 3.0.0 and 3.0.1](apache/ratis@ratis-3.0.0...ratis-3.0.1) releases.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Cluster manual test.
Closes#2480 from SteNicholas/CELEBORN-1400.
Authored-by: SteNicholas <programgeek@163.com>
Signed-off-by: Shuang <lvshuang.xjs@alibaba-inc.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@szetszwoszetszwoszetszwo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@wojiaodoubao@szetszwo