Simplify node stopping call (#88547)

There is no need to use stopRandomNode/namePredicate combination to stop a node by its name.
elastic · Jul 22, 2022 · 584f7f2 · 584f7f2
1 parent bd5e16d
commit 584f7f2
Show file tree

Hide file tree

Showing 32 changed files with 85 additions and 108 deletions.
diff --git a/...t-netty4/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java b/...t-netty4/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java
@@ -151,7 +151,7 @@ public void testClearVotingTombstonesWaitingForRemoval() throws Exception {
         final Response response = restClient.performRequest(request);
         assertThat(response.getStatusLine().getStatusCode(), is(200));
         assertThat(response.getEntity().getContentLength(), is(0L));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodeToWithdraw));
+        internalCluster().stopNode(nodeToWithdraw);
         Response deleteResponse = restClient.performRequest(new Request("DELETE", "/_cluster/voting_config_exclusions"));
         assertThat(deleteResponse.getStatusLine().getStatusCode(), is(200));
         assertThat(deleteResponse.getEntity().getContentLength(), is(0L));
@@ -167,8 +167,8 @@ public void testRemoveTwoNodesAtOnce() throws Exception {
         final Response response = restClient.performRequest(request);
         assertThat(response.getStatusLine().getStatusCode(), is(200));
         assertThat(response.getEntity().getContentLength(), is(0L));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodes.get(0)));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodes.get(2)));
+        internalCluster().stopNode(nodes.get(0));
+        internalCluster().stopNode(nodes.get(2));
         ensureStableCluster(1);
     }
 }
diff --git a/...4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/ESLoggingHandlerIT.java b/...4/src/internalClusterTest/java/org/elasticsearch/transport/netty4/ESLoggingHandlerIT.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.MockLogAppender;
 import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.transport.TcpTransport;
@@ -110,7 +109,7 @@ public void testConnectionLogging() throws IOException {
         );
 
         final String nodeName = internalCluster().startNode();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodeName));
+        internalCluster().stopNode(nodeName);
 
         appender.assertAllExpectationsMatched();
     }

diff --git a/...st/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java b/...st/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
@@ -32,7 +32,6 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
@@ -71,7 +70,7 @@ public void testUnassignedPrimaryWithExistingIndex() throws Exception {
         prepareIndex(1, 0);
 
         logger.info("--> stopping the node with the primary");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primaryNodeName()));
+        internalCluster().stopNode(primaryNodeName());
         ensureStableCluster(1);
         refreshClusterInfo();
 
@@ -150,7 +149,7 @@ public void testUnassignedReplicaDelayedAllocation() throws Exception {
 
         prepareIndex(1, 1);
         logger.info("--> stopping the node with the replica");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(replicaNode().getName()));
+        internalCluster().stopNode(replicaNode().getName());
         ensureStableCluster(2);
         refreshClusterInfo();
         assertBusy(() ->
@@ -291,8 +290,8 @@ public void testUnassignedReplicaWithPriorCopy() throws Exception {
         logger.info("--> shutting down all nodes except the one that holds the primary");
         Settings node0DataPathSettings = internalCluster().dataPathSettings(nodes.get(0));
         Settings node1DataPathSettings = internalCluster().dataPathSettings(nodes.get(1));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodes.get(0)));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodes.get(1)));
+        internalCluster().stopNode(nodes.get(0));
+        internalCluster().stopNode(nodes.get(1));
         ensureStableCluster(1);
 
         logger.info("--> setting allocation filtering to only allow allocation on the currently running node");
@@ -1080,7 +1079,7 @@ public void testCannotAllocateStaleReplicaExplanation() throws Exception {
         assertThat(primaryNodeName(), equalTo(primaryNode));
 
         logger.info("--> stop node with the replica shard");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(replicaNode));
+        internalCluster().stopNode(replicaNode);
 
         final IndexMetadata.State indexState = randomIndexState();
         if (indexState == IndexMetadata.State.OPEN) {
@@ -1102,7 +1101,7 @@ public void testCannotAllocateStaleReplicaExplanation() throws Exception {
         }
 
         logger.info("--> stop the node with the primary");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primaryNode));
+        internalCluster().stopNode(primaryNode);
 
         logger.info("--> restart the node with the stale replica");
         String restartedNode = internalCluster().startDataOnlyNode(replicaDataPathSettings);

diff --git a/...lusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java b/...lusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java
@@ -42,7 +42,6 @@
 import org.elasticsearch.tasks.TaskInfo;
 import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.SendRequestTransportException;
 import org.elasticsearch.transport.Transport;
@@ -294,7 +293,7 @@ public void testCancelOrphanedTasks() throws Exception {
         client(nodeWithRootTask).execute(TransportTestAction.ACTION, rootRequest);
         allowPartialRequest(rootRequest);
         try {
-            internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodeWithRootTask));
+            internalCluster().stopNode(nodeWithRootTask);
             assertBusy(() -> {
                 for (TransportService transportService : internalCluster().getInstances(TransportService.class)) {
                     for (CancellableTask task : transportService.getTaskManager().getCancellableTasks().values()) {

diff --git a/...internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/...internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java
@@ -47,7 +47,6 @@
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.xcontent.XContentType;
 
@@ -668,7 +667,7 @@ public void testShrinkThenSplitWithFailedNode() throws Exception {
         ensureGreen();
 
         final int nodeCount = cluster().size();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(shrinkNode));
+        internalCluster().stopNode(shrinkNode);
         ensureStableCluster(nodeCount - 1);
 
         // demonstrate that the index.routing.allocation.initial_recovery setting from the shrink doesn't carry over into the split index,

diff --git a/...asticsearch/action/support/replication/TransportReplicationActionRetryOnClosedNodeIT.java b/...asticsearch/action/support/replication/TransportReplicationActionRetryOnClosedNodeIT.java
@@ -29,7 +29,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transport;
@@ -224,7 +223,7 @@ public void testRetryOnStoppedTransportService() throws Exception {
                 throw new AssertionError(e);
             }
         });
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(primary));
+        internalCluster().stopNode(primary);
 
         assertTrue(doneLatch.await(10, TimeUnit.SECONDS));
         if (response.get() instanceof Exception) {

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
@@ -27,7 +27,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.elasticsearch.test.ESIntegTestCase.Scope;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.disruption.NetworkDisruption;
 import org.elasticsearch.test.transport.MockTransportService;
 
@@ -133,7 +132,7 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         client().execute(AddVotingConfigExclusionsAction.INSTANCE, new AddVotingConfigExclusionsRequest(otherNode)).get();
         logger.info("--> stop master node, no master block should appear");
         Settings masterDataPathSettings = internalCluster().dataPathSettings(masterNode);
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(masterNode));
+        internalCluster().stopNode(masterNode);
 
         assertBusy(() -> {
             ClusterState clusterState = client().admin().cluster().prepareState().setLocal(true).execute().actionGet().getState();
@@ -186,7 +185,7 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         client().execute(AddVotingConfigExclusionsAction.INSTANCE, new AddVotingConfigExclusionsRequest(masterNode)).get();
         logger.info("--> stop non-master node, no master block should appear");
         Settings otherNodeDataPathSettings = internalCluster().dataPathSettings(otherNode);
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(otherNode));
+        internalCluster().stopNode(otherNode);
 
         assertBusy(() -> {
             ClusterState state1 = client().admin().cluster().prepareState().setLocal(true).execute().actionGet().getState();

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.elasticsearch.test.ESIntegTestCase.Scope;
-import org.elasticsearch.test.InternalTestCluster;
 
 import java.io.IOException;
 
@@ -258,7 +257,7 @@ public void testElectOnlyBetweenMasterNodes() throws Exception {
                 equalTo(nextMasterEligableNodeName)
             );
         });
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(masterNodeName));
+        internalCluster().stopNode(masterNodeName);
         assertThat(
             internalCluster().nonMasterClient()
                 .admin()

diff --git a/...r/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/...r/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
@@ -45,7 +45,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.elasticsearch.test.ESIntegTestCase.Scope;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.MockLogAppender;
 
 import java.nio.file.Path;
@@ -247,7 +246,7 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
         ensureGreen(TimeValue.timeValueMinutes(1));
 
         logger.info("--> stopping node1");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node_1));
+        internalCluster().stopNode(node_1);
 
         // This might run slowly on older hardware
         ensureGreen(TimeValue.timeValueMinutes(2));

diff --git a/...erTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java b/...erTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java
@@ -238,8 +238,8 @@ public void test3MasterNodes2Failed() throws Exception {
         Settings dataNodeDataPathSettings = internalCluster().dataPathSettings(dataNode);
 
         logger.info("--> stop 2nd and 3d master eligible node");
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(masterNodes.get(1)));
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(masterNodes.get(2)));
+        internalCluster().stopNode(masterNodes.get(1));
+        internalCluster().stopNode(masterNodes.get(2));
 
         logger.info("--> ensure NO_MASTER_BLOCK on data-only node");
         assertBusy(() -> {
@@ -262,7 +262,7 @@ public void test3MasterNodes2Failed() throws Exception {
 
         logger.info("--> stop 1st master-eligible node and data-only node");
         NodeEnvironment nodeEnvironment = internalCluster().getAnyMasterNodeInstance(NodeEnvironment.class);
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(masterNodes.get(0)));
+        internalCluster().stopNode(masterNodes.get(0));
         assertBusy(() -> internalCluster().getInstance(GatewayMetaState.class, dataNode).allPendingAsyncStatesWritten());
         internalCluster().stopRandomDataNode();
 
@@ -351,7 +351,7 @@ public void testNoInitialBootstrapAfterDetach() throws Exception {
         ClusterState state = internalCluster().client().admin().cluster().prepareState().setLocal(true).execute().actionGet().getState();
         assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
 
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node));
+        internalCluster().stopNode(node);
     }
 
     public void testCanRunUnsafeBootstrapAfterErroneousDetachWithoutLoosingMetadata() throws Exception {

diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java
@@ -32,7 +32,6 @@
 import org.elasticsearch.test.DummyShardLock;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.InternalSettingsPlugin;
-import org.elasticsearch.test.InternalTestCluster;
 import org.elasticsearch.test.transport.MockTransportService;
 
 import java.io.IOException;
@@ -98,13 +97,13 @@ public void testFailedRecoveryOnAllocateStalePrimaryRequiresAnotherAllocateStale
 
         Settings node1DataPathSettings = internalCluster().dataPathSettings(node1);
         Settings node2DataPathSettings = internalCluster().dataPathSettings(node2);
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node1));
+        internalCluster().stopNode(node1);
 
         // index more docs to node2 that marks node1 as stale
         int numExtraDocs = indexDocs(indexName, "foo", "bar2");
         assertHitCount(client(node2).prepareSearch(indexName).setQuery(matchAllQuery()).get(), numDocs + numExtraDocs);
 
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node2));
+        internalCluster().stopNode(node2);
 
         // create fake corrupted marker on node1
         putFakeCorruptionMarker(indexSettings, shardId, indexPath);

diff --git a/...r/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/...r/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 
 import java.util.Collections;
 import java.util.List;
@@ -39,7 +38,7 @@ public void testNoDelayedTimeout() throws Exception {
         ).get();
         ensureGreen("test");
         indexRandomData();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));
+        internalCluster().stopNode(findNodeWithShard());
         assertThat(client().admin().cluster().prepareHealth().get().getDelayedUnassignedShards(), equalTo(0));
         ensureGreen("test");
     }
@@ -62,7 +61,7 @@ public void testDelayedAllocationNodeLeavesAndComesBack() throws Exception {
         indexRandomData();
         String nodeWithShard = findNodeWithShard();
         Settings nodeWithShardDataPathSettings = internalCluster().dataPathSettings(nodeWithShard);
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(nodeWithShard));
+        internalCluster().stopNode(nodeWithShard);
         assertBusy(
             () -> assertThat(
                 client().admin().cluster().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0,
@@ -88,7 +87,7 @@ public void testDelayedAllocationTimesOut() throws Exception {
         ).get();
         ensureGreen("test");
         indexRandomData();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));
+        internalCluster().stopNode(findNodeWithShard());
         ensureGreen("test");
         internalCluster().startNode();
         // do a second round with longer delay to make sure it happens
@@ -101,7 +100,7 @@ public void testDelayedAllocationTimesOut() throws Exception {
                 )
                 .get()
         );
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));
+        internalCluster().stopNode(findNodeWithShard());
         ensureGreen("test");
     }
 
@@ -120,7 +119,7 @@ public void testDelayedAllocationChangeWithSettingTo100ms() throws Exception {
         ).get();
         ensureGreen("test");
         indexRandomData();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));
+        internalCluster().stopNode(findNodeWithShard());
         assertBusy(
             () -> assertThat(
                 client().admin().cluster().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0,
@@ -156,7 +155,7 @@ public void testDelayedAllocationChangeWithSettingTo0() throws Exception {
         ).get();
         ensureGreen("test");
         indexRandomData();
-        internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));
+        internalCluster().stopNode(findNodeWithShard());
         assertBusy(
             () -> assertThat(
                 client().admin().cluster().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0,