[CI] Auto commit changes from spotless

Author: elasticsearchmachine

server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/MasterElectionTestCase.java

@@ -77,7 +77,11 @@ protected CountDownLatch configureElectionLatchForNewMaster(String newMaster, Li
      * @param cleanupTasks The list of cleanup tasks
      * @return A latch that will be released when the master acknowledges it's re-election
      */
-    protected CountDownLatch configureElectionLatchForReElectedMaster(String masterNodeName, long originalTerm, List<Releasable> cleanupTasks) {
+    protected CountDownLatch configureElectionLatchForReElectedMaster(
+        String masterNodeName,
+        long originalTerm,
+        List<Releasable> cleanupTasks
+    ) {
         final var masterKnowsItIsReElectedLatch = new CountDownLatch(1);
         ClusterStateApplier newMasterMonitor = event -> {
             DiscoveryNode masterNode = event.state().nodes().getMasterNode();

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

@@ -17,20 +17,12 @@
 
 import java.util.Collection;
 
-@ESIntegTestCase.ClusterScope(
-    scope = ESIntegTestCase.Scope.TEST,
-    numDataNodes = 0,
-    numClientNodes = 0,
-    autoManageMasterNodes = false
-)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, autoManageMasterNodes = false)
 public class NodeJoiningIT extends MasterElectionTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return CollectionUtils.appendToCopyNoNullElements(
-            super.nodePlugins(),
-            MockTransportService.TestPlugin.class
-        );
+        return CollectionUtils.appendToCopyNoNullElements(super.nodePlugins(), MockTransportService.TestPlugin.class);
     }
 
     public void testNodeJoinsCluster() {

server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/NodeJoiningMasterElectionIT.java

@@ -39,10 +39,7 @@ public class NodeJoiningMasterElectionIT extends MasterElectionTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return CollectionUtils.appendToCopyNoNullElements(
-            super.nodePlugins(),
-            MockTransportService.TestPlugin.class
-        );
+        return CollectionUtils.appendToCopyNoNullElements(super.nodePlugins(), MockTransportService.TestPlugin.class);
     }
 
     @Override
@@ -68,8 +65,7 @@ public void testNodeTriesToJoinClusterAndThenDifferentMasterIsElected() {
 
             String originalMasterName = internalCluster().getMasterName();
             int numberOfNodesOriginallyInCluster = internalCluster().clusterService().state().getNodes().size();
-            List<String> namesOfDataNodesInOriginalCluster = internalCluster()
-                .clusterService()
+            List<String> namesOfDataNodesInOriginalCluster = internalCluster().clusterService()
                 .state()
                 .getNodes()
                 .getDataNodes()
@@ -90,11 +86,10 @@ public void testNodeTriesToJoinClusterAndThenDifferentMasterIsElected() {
                 if (mockTransportService.getLocalNode().getName().equals(newMaster) == false) {
                     mockTransportService.addSendBehavior((connection, requestId, action, request, options) -> {
                         if (
-                            // This disables pre-voting on all nodes except the new master, forcing it to win the election
-                            action.equals(StatefulPreVoteCollector.REQUEST_PRE_VOTE_ACTION_NAME)
+                        // This disables pre-voting on all nodes except the new master, forcing it to win the election
+                        action.equals(StatefulPreVoteCollector.REQUEST_PRE_VOTE_ACTION_NAME)
                             // This forces the current master node to fail
-                            || action.equals(PublicationTransportHandler.PUBLISH_STATE_ACTION_NAME)
-                        ) {
+                            || action.equals(PublicationTransportHandler.PUBLISH_STATE_ACTION_NAME)) {
                             throw new ElasticsearchException("[{}] for [{}] denied", action, connection.getNode());
                         } else {
                             connection.sendRequest(requestId, action, request, options);
@@ -176,10 +171,7 @@ public void assertMatched() {
     }
 
     // Tests whether a WARN log is thrown when a node attempts to join a cluster, and then the same master node is re-elected (#126192)
-    @TestLogging(
-        reason = "test includes assertions about logging",
-        value = "org.elasticsearch.cluster.coordination.NodeJoinExecutor:WARN"
-    )
+    @TestLogging(reason = "test includes assertions about logging", value = "org.elasticsearch.cluster.coordination.NodeJoinExecutor:WARN")
     public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
         final var cleanupTasks = new ArrayList<Releasable>();
 
@@ -190,8 +182,7 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
 
             long originalTerm = internalCluster().clusterService().state().coordinationMetadata().term();
             int numberOfNodesOriginallyInCluster = internalCluster().clusterService().state().getNodes().size();
-            List<String> namesOfDataNodesInOriginalCluster = internalCluster()
-                .clusterService()
+            List<String> namesOfDataNodesInOriginalCluster = internalCluster().clusterService()
                 .state()
                 .getNodes()
                 .getDataNodes()
@@ -201,17 +192,24 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
                 .toList();
 
             // A CountDownLatch that only gets decremented when the first master node is re-elected
-            final var masterKnowsItHasBeenReElectedLatch = configureElectionLatchForReElectedMaster(originalMasterName, originalTerm, cleanupTasks);
-
-            // A list of CountDownLatches, one for each node, that only gets decremented when it recieves a cluster state update containing the new node N
+            final var masterKnowsItHasBeenReElectedLatch = configureElectionLatchForReElectedMaster(
+                originalMasterName,
+                originalTerm,
+                cleanupTasks
+            );
+
+            // A list of CountDownLatches, one for each node, that only gets decremented when it recieves a cluster state update containing
+            // the new node N
             List<CountDownLatch> newNodeIsPresentInClusterStateLatchList = new ArrayList<>();
 
             for (final var transportService : internalCluster().getInstances(TransportService.class)) {
                 final var mockTransportService = asInstanceOf(MockTransportService.class, transportService);
                 cleanupTasks.add(mockTransportService::clearAllRules);
 
                 String nodeName = mockTransportService.getLocalNode().getName();
-                newNodeIsPresentInClusterStateLatchList.add(waitUntilNewNodeIsPresentInClusterStateUpdate(nodeName, numberOfNodesOriginallyInCluster, cleanupTasks));
+                newNodeIsPresentInClusterStateLatchList.add(
+                    waitUntilNewNodeIsPresentInClusterStateUpdate(nodeName, numberOfNodesOriginallyInCluster, cleanupTasks)
+                );
 
                 if (nodeName.equals(originalMasterName)) {
                     mockTransportService.addSendBehavior((connection, requestId, action, request, options) -> {
@@ -223,15 +221,20 @@ public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
                         }
                     });
 
-                    // This removes the PUBLISH_STATE_ACTION_NAME mocking set above once we have triggered an election to allow the master node to be re-elected
-                    removeMockTransportServicePublishBanWhenMasterHasSteppedDown(originalMasterName, originalTerm, mockTransportService, cleanupTasks);
+                    // This removes the PUBLISH_STATE_ACTION_NAME mocking set above once we have triggered an election to allow the master
+                    // node to be re-elected
+                    removeMockTransportServicePublishBanWhenMasterHasSteppedDown(
+                        originalMasterName,
+                        originalTerm,
+                        mockTransportService,
+                        cleanupTasks
+                    );
                 } else {
                     mockTransportService.addSendBehavior((connection, requestId, action, request, options) -> {
                         if (
-                            // This disables pre-voting on all nodes except the master, forcing it to win the election
-                            action.equals(StatefulPreVoteCollector.REQUEST_PRE_VOTE_ACTION_NAME)
-                                || action.equals(PublicationTransportHandler.PUBLISH_STATE_ACTION_NAME)
-                        ) {
+                        // This disables pre-voting on all nodes except the master, forcing it to win the election
+                        action.equals(StatefulPreVoteCollector.REQUEST_PRE_VOTE_ACTION_NAME)
+                            || action.equals(PublicationTransportHandler.PUBLISH_STATE_ACTION_NAME)) {
                             throw new ElasticsearchException("[{}] for [{}] denied", action, connection.getNode());
                         } else {
                             connection.sendRequest(requestId, action, request, options);
@@ -287,14 +290,14 @@ public void assertMatched() {
                 // Sends a node join request to the original master node. This will fail, and cause a master failover
                 String newNodeName = internalCluster().startDataOnlyNode();
 
-
                 // Wait until the master acknowledges its re-election. The master is only re-elected once it's publishing ban is lifted
                 safeAwait(masterKnowsItHasBeenReElectedLatch);
                 assertEquals(originalMasterName, internalCluster().getMasterName());
 
                 logger.info("Master has been re-elected");
 
-                // Wait for the cluster state update containing the new node N to propagate to all nodes. This gives times for the WARN log to be emitted
+                // Wait for the cluster state update containing the new node N to propagate to all nodes. This gives times for the WARN log
+                // to be emitted
                 for (CountDownLatch countDownLatch : newNodeIsPresentInClusterStateLatchList) {
                     safeAwait(countDownLatch);
                 }
@@ -329,15 +332,31 @@ private String generateNodeDescriptionForNewNode(int numberOfNodesOriginallyInCl
         String newNodeName = "node_s" + numberOfNodesOriginallyInCluster;
         String regexToMatchAnyCharacterExceptClosingBrace = "([^}]+)";
 
-        return "\\{" + newNodeName + "}"
-            + "\\{" + regexToMatchAnyCharacterExceptClosingBrace + "}"
-            + "\\{" + regexToMatchAnyCharacterExceptClosingBrace + "}"
-            + "\\{" + newNodeName + "}"
-            + "\\{" + masterNode.getHostAddress() + "}"
-            + "\\{" + masterNode.getHostAddress() + ":\\d+}"
+        return "\\{"
+            + newNodeName
+            + "}"
+            + "\\{"
+            + regexToMatchAnyCharacterExceptClosingBrace
+            + "}"
+            + "\\{"
+            + regexToMatchAnyCharacterExceptClosingBrace
+            + "}"
+            + "\\{"
+            + newNodeName
+            + "}"
+            + "\\{"
+            + masterNode.getHostAddress()
+            + "}"
+            + "\\{"
+            + masterNode.getHostAddress()
+            + ":\\d+}"
             + "\\{d}"
-            + "\\{" + masterNode.getVersion() + "}"
-            + "\\{" + regexToMatchAnyCharacterExceptClosingBrace + "}";
+            + "\\{"
+            + masterNode.getVersion()
+            + "}"
+            + "\\{"
+            + regexToMatchAnyCharacterExceptClosingBrace
+            + "}";
     }
 
     /**
@@ -347,7 +366,12 @@ private String generateNodeDescriptionForNewNode(int numberOfNodesOriginallyInCl
      * @param originalTerm The term the current master node was first elected
      * @param cleanupTasks The list of cleanup tasks
      */
-    protected void removeMockTransportServicePublishBanWhenMasterHasSteppedDown(String masterNodeName, long originalTerm, MockTransportService mockTransportService, List<Releasable> cleanupTasks) {
+    protected void removeMockTransportServicePublishBanWhenMasterHasSteppedDown(
+        String masterNodeName,
+        long originalTerm,
+        MockTransportService mockTransportService,
+        List<Releasable> cleanupTasks
+    ) {
         ClusterStateApplier newMasterMonitor = event -> {
             DiscoveryNode masterNode = event.state().nodes().getMasterNode();
             long currentTerm = event.state().coordinationMetadata().term();
@@ -377,7 +401,11 @@ protected void removeMockTransportServicePublishBanWhenMasterHasSteppedDown(Stri
      * @param originalNumberOfNodes The number of nodes the cluster had before we attempted to add node N
      * @param cleanupTasks The list of cleanup tasks
      */
-    protected CountDownLatch waitUntilNewNodeIsPresentInClusterStateUpdate(String nodeName, int originalNumberOfNodes, List<Releasable> cleanupTasks) {
+    protected CountDownLatch waitUntilNewNodeIsPresentInClusterStateUpdate(
+        String nodeName,
+        int originalNumberOfNodes,
+        List<Releasable> cleanupTasks
+    ) {
         final AtomicBoolean nodeHasBeenAddedFirstTime = new AtomicBoolean(false);
         final AtomicBoolean addedNodeHasBeenRemoved = new AtomicBoolean(false);
         final var nodeHasBeenAddedLatch = new CountDownLatch(1);