Skip to content

Commit ef0905b

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 17e6bd6 commit ef0905b

File tree

2 files changed

+71
-74
lines changed

2 files changed

+71
-74
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/NodeJoiningIT.java‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ public void testNodeJoinsCluster() {
6464
String masterNodeName = internalCluster().getMasterName();
6565
DiscoveryNode masterNode = internalCluster().clusterService(masterNodeName).state().nodes().getMasterNode();
6666
int numberOfNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName).state().getNodes().size();
67-
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName).state().nodes().getMasterNodes().size();
67+
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName)
68+
.state()
69+
.nodes()
70+
.getMasterNodes()
71+
.size();
6872
List<String> namesOfDataNodesInOriginalCluster = getListOfDataNodeNamesFromCluster(masterNodeName);
6973

7074
// Ensure the logging is as expected
@@ -109,7 +113,11 @@ public void testNodeTriesToJoinClusterAndThenDifferentMasterIsElected() {
109113
final var newMasterNodeName = ensureSufficientMasterEligibleNodes();
110114
String originalMasterNodeName = internalCluster().getMasterName();
111115
int numberOfNodesOriginallyInCluster = internalCluster().clusterService(originalMasterNodeName).state().getNodes().size();
112-
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(originalMasterNodeName).state().nodes().getMasterNodes().size();
116+
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(originalMasterNodeName)
117+
.state()
118+
.nodes()
119+
.getMasterNodes()
120+
.size();
113121
List<String> namesOfDataNodesInOriginalCluster = getListOfDataNodeNamesFromCluster(originalMasterNodeName);
114122
DiscoveryNode masterNode = internalCluster().clusterService(originalMasterNodeName).state().getNodes().getMasterNode();
115123

@@ -152,13 +160,10 @@ public void testNodeTriesToJoinClusterAndThenDifferentMasterIsElected() {
152160

153161
// Wait until the old master has acknowledged the new master's election
154162
ClusterService originalMasterClusterService = internalCluster().getInstance(ClusterService.class, originalMasterNodeName);
155-
ClusterServiceUtils.addTemporaryStateListener(
156-
originalMasterClusterService,
157-
clusterState -> {
158-
DiscoveryNode currentMasterNode = clusterState.nodes().getMasterNode();
159-
return currentMasterNode != null && currentMasterNode.getName().equals(newMasterNodeName);
160-
}
161-
);
163+
ClusterServiceUtils.addTemporaryStateListener(originalMasterClusterService, clusterState -> {
164+
DiscoveryNode currentMasterNode = clusterState.nodes().getMasterNode();
165+
return currentMasterNode != null && currentMasterNode.getName().equals(newMasterNodeName);
166+
});
162167
assertNotEquals(originalMasterNodeName, internalCluster().getMasterName());
163168
logger.info("New master is elected");
164169

@@ -204,7 +209,11 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
204209
long originalTerm = internalCluster().clusterService(masterNodeName).state().coordinationMetadata().term();
205210
long originalVersion = internalCluster().clusterService(masterNodeName).state().version();
206211
int numberOfNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName).state().getNodes().size();
207-
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName).state().nodes().getMasterNodes().size();
212+
int numberOfMasterNodesOriginallyInCluster = internalCluster().clusterService(masterNodeName)
213+
.state()
214+
.nodes()
215+
.getMasterNodes()
216+
.size();
208217
List<String> namesOfDataNodesInOriginalCluster = getListOfDataNodeNamesFromCluster(masterNodeName);
209218
String[] namesOfAllNodesInOriginalCluster = internalCluster().getNodeNames();
210219

@@ -286,14 +295,11 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
286295

287296
// Wait until the master acknowledges its re-election. The master is only re-elected once it's publishing ban is lifted
288297
ClusterService masterClusterService = internalCluster().getInstance(ClusterService.class, masterNodeName);
289-
ClusterServiceUtils.addTemporaryStateListener(
290-
masterClusterService,
291-
clusterState -> {
292-
DiscoveryNode currentMasterNode = clusterState.nodes().getMasterNode();
293-
long currentTerm = clusterState.coordinationMetadata().term();
294-
return currentMasterNode != null && currentMasterNode.getName().equals(masterNodeName) && currentTerm > originalTerm;
295-
}
296-
);
298+
ClusterServiceUtils.addTemporaryStateListener(masterClusterService, clusterState -> {
299+
DiscoveryNode currentMasterNode = clusterState.nodes().getMasterNode();
300+
long currentTerm = clusterState.coordinationMetadata().term();
301+
return currentMasterNode != null && currentMasterNode.getName().equals(masterNodeName) && currentTerm > originalTerm;
302+
});
297303
assertEquals(masterNodeName, internalCluster().getMasterName());
298304
logger.info("Master has been re-elected");
299305

@@ -302,7 +308,7 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
302308
for (String nodeName : namesOfAllNodesInOriginalCluster) {
303309
ClusterServiceUtils.awaitClusterState(
304310
logger,
305-
clusterState -> nodeExistsWithName(clusterState.nodes(),newNodeName),
311+
clusterState -> nodeExistsWithName(clusterState.nodes(), newNodeName),
306312
internalCluster().clusterService(nodeName)
307313
);
308314
}
@@ -592,7 +598,7 @@ protected CountDownLatch removeMockTransportServicePublishBanWhenMasterHasSteppe
592598
*/
593599
protected static String ensureSufficientMasterEligibleNodes() {
594600
final var votingConfigSizeListener = ClusterServiceUtils.addTemporaryStateListener(
595-
cs -> 3 <= cs.coordinationMetadata().getLastCommittedConfiguration().getNodeIds().size()
601+
cs -> 3 <= cs.coordinationMetadata().getLastCommittedConfiguration().getNodeIds().size()
596602
);
597603

598604
try {

‎server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java‎

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -669,65 +669,56 @@ private void handleJoinRequest(JoinRequest joinRequest, ActionListener<Void> joi
669669
transportService.connectToNode(joinRequest.getSourceNode(), new ActionListener<>() {
670670
@Override
671671
public void onResponse(Releasable response) {
672-
validateJoinRequest(
673-
joinRequest,
674-
new ActionListener<>() {
675-
@Override
676-
public void onResponse(Void unused) {
677-
processJoinRequest(
678-
joinRequest,
679-
ActionListener.runBefore(
680-
joinListener,
681-
() -> Releasables.close(response)
682-
)
683-
);
684-
}
672+
validateJoinRequest(joinRequest, new ActionListener<>() {
673+
@Override
674+
public void onResponse(Void unused) {
675+
processJoinRequest(joinRequest, ActionListener.runBefore(joinListener, () -> Releasables.close(response)));
676+
}
685677

686-
/*
687-
This prevents a corner case, explained in #ES-11449, occurring as follows:
688-
- Master M is in term T and has cluster state (T, V).
689-
- Node N tries to join the cluster.
690-
- M proposes cluster state (T, V+1) with N in the cluster.
691-
- M accepts its own proposal and commits it to disk.
692-
- M receives no responses. M doesn't know whether the state was accepted by a majority of nodes,
693-
rejected, or did not reach any nodes.
694-
- There is a re-election and M wins. M publishes cluster state (T+1, V+2).
695-
Since it's built from the cluster state on disk, N is still in the cluster.
696-
- Since (T, V+1) failed, a FailedToCommitClusterStateException is thrown and N's connection is dropped,
697-
even though its inclusion in the cluster may have been committed on a majority of master nodes.
698-
- It can rejoin, but this throws a WARN log since it did not restart.
699-
700-
To mitigate this, we optionally listen for the next committed cluster state update:
701-
1. (T, V+1) is accepted -> NodeConnectionsService now stores an open connection to N.
702-
The connection can be closed as soon as the node has joined. This is handled by onResponse above.
703-
2. (T, V+1) is rejected -> A new cluster state is published without N in it
704-
It is right to close the connection and retry. This is handled by onResponse above.
705-
3. The above scenario occurs, and a FailedToCommitClusterStateException is thrown for state (T, V+1).
706-
Now, we keep the connection open until the next committed cluster state, rather than disconnecting:
707-
3.1 (T+1, V+2) is accepted -> By waiting, we did not close the connection to N unnecessarily
708-
3.2 (T+1, V+2) is rejected -> A new cluster state is published without N in it. Closing is correct here.
709-
*/
710-
@Override
711-
public void onFailure(Exception e) {
712-
if (e instanceof FailedToCommitClusterStateException) {
713-
ClusterStateListener clusterStateListener = new ClusterStateListener() {
714-
@Override
715-
public void clusterChanged(ClusterChangedEvent event) {
716-
// Keep the connection open until the next committed state
717-
if (event.state().nodes().getMasterNode() != null) {
718-
Releasables.close(response);
719-
// Remove this listener to avoid memory leaks
720-
clusterService.removeListener(this);
721-
}
678+
/*
679+
This prevents a corner case, explained in #ES-11449, occurring as follows:
680+
- Master M is in term T and has cluster state (T, V).
681+
- Node N tries to join the cluster.
682+
- M proposes cluster state (T, V+1) with N in the cluster.
683+
- M accepts its own proposal and commits it to disk.
684+
- M receives no responses. M doesn't know whether the state was accepted by a majority of nodes,
685+
rejected, or did not reach any nodes.
686+
- There is a re-election and M wins. M publishes cluster state (T+1, V+2).
687+
Since it's built from the cluster state on disk, N is still in the cluster.
688+
- Since (T, V+1) failed, a FailedToCommitClusterStateException is thrown and N's connection is dropped,
689+
even though its inclusion in the cluster may have been committed on a majority of master nodes.
690+
- It can rejoin, but this throws a WARN log since it did not restart.
691+
692+
To mitigate this, we optionally listen for the next committed cluster state update:
693+
1. (T, V+1) is accepted -> NodeConnectionsService now stores an open connection to N.
694+
The connection can be closed as soon as the node has joined. This is handled by onResponse above.
695+
2. (T, V+1) is rejected -> A new cluster state is published without N in it
696+
It is right to close the connection and retry. This is handled by onResponse above.
697+
3. The above scenario occurs, and a FailedToCommitClusterStateException is thrown for state (T, V+1).
698+
Now, we keep the connection open until the next committed cluster state, rather than disconnecting:
699+
3.1 (T+1, V+2) is accepted -> By waiting, we did not close the connection to N unnecessarily
700+
3.2 (T+1, V+2) is rejected -> A new cluster state is published without N in it. Closing is correct here.
701+
*/
702+
@Override
703+
public void onFailure(Exception e) {
704+
if (e instanceof FailedToCommitClusterStateException) {
705+
ClusterStateListener clusterStateListener = new ClusterStateListener() {
706+
@Override
707+
public void clusterChanged(ClusterChangedEvent event) {
708+
// Keep the connection open until the next committed state
709+
if (event.state().nodes().getMasterNode() != null) {
710+
Releasables.close(response);
711+
// Remove this listener to avoid memory leaks
712+
clusterService.removeListener(this);
722713
}
723-
};
714+
}
715+
};
724716

725-
clusterService.addListener(clusterStateListener);
726-
}
727-
joinListener.onFailure(e);
717+
clusterService.addListener(clusterStateListener);
728718
}
719+
joinListener.onFailure(e);
729720
}
730-
);
721+
});
731722
}
732723

733724
@Override

0 commit comments

Comments
 (0)