Don't start a new node in InternalTestCluster#getClient

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java

@@ -57,7 +57,7 @@
 /**
  * An integration test that verifies how different paths/scenarios affect the APM metrics for failure stores.
  */
-@ESIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = ESIntegTestCase.Scope.SUITE)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false)
 public class IngestFailureStoreMetricsIT extends ESIntegTestCase {
 
     private static final List<String> METRICS = List.of(

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/snapshots/AbstractSnapshotRestTestCase.java

@@ -14,11 +14,9 @@
 import org.elasticsearch.http.HttpSmokeTestCase;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.snapshots.mockstore.MockRepository;
-import org.elasticsearch.test.ESIntegTestCase;
 
 import java.util.Collection;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
 public abstract class AbstractSnapshotRestTestCase extends HttpSmokeTestCase {
 
     /**

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/snapshots/RestGetSnapshotsCancellationIT.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.client.Response;
 import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
 import org.elasticsearch.snapshots.mockstore.MockRepository;
+import org.elasticsearch.test.ESIntegTestCase;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.TimeUnit;
@@ -27,6 +28,7 @@
 import static org.elasticsearch.test.TaskAssertions.awaitTaskWithPrefix;
 import static org.hamcrest.core.IsEqual.equalTo;
 
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class RestGetSnapshotsCancellationIT extends AbstractSnapshotRestTestCase {
 
     public void testGetSnapshotsCancellation() throws Exception {

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/snapshots/RestSnapshotsStatusCancellationIT.java

@@ -17,6 +17,7 @@
 import org.elasticsearch.client.Response;
 import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
 import org.elasticsearch.snapshots.mockstore.MockRepository;
+import org.elasticsearch.test.ESIntegTestCase;
 
 import java.util.Collection;
 import java.util.concurrent.CancellationException;
@@ -27,6 +28,7 @@
 import static org.elasticsearch.test.TaskAssertions.assertAllTasksHaveFinished;
 import static org.elasticsearch.test.TaskAssertions.awaitTaskWithPrefix;
 
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class RestSnapshotsStatusCancellationIT extends AbstractSnapshotRestTestCase {
 
     public void testSnapshotStatusCancellation() throws Exception {

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java

@@ -50,7 +50,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class AutoCreateSystemIndexIT extends ESIntegTestCase {
 
     @Override

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateSystemIndicesIT.java

@@ -56,7 +56,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class CreateSystemIndicesIT extends ESIntegTestCase {
 
     @Before
@@ -104,7 +103,6 @@ public void testSystemIndexIsAutoCreatedViaConcreteName() {
      */
     public void testNonPrimarySystemIndexIsAutoCreatedViaConcreteName() throws Exception {
         final String nonPrimarySystemIndex = INDEX_NAME + "-2";
-        internalCluster().startNodes(1);
 
         // Trigger the creation of the system index
         indexDoc(nonPrimarySystemIndex, "1", "foo", "bar");
@@ -132,7 +130,6 @@ public void testNonPrimarySystemIndexIsAutoCreatedViaConcreteName() throws Excep
      */
     public void testNonPrimarySystemIndexCreationThrowsError() {
         final String nonPrimarySystemIndex = INDEX_NAME + "-2";
-        internalCluster().startNodes(1);
 
         // Create the system index
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> createIndex(nonPrimarySystemIndex));
@@ -269,8 +266,6 @@ public void testCreateSystemAliasViaComposableTemplateWithAllowsTemplates() thro
     }
 
     private void doCreateTest(Runnable runnable, String concreteIndex) {
-        internalCluster().startNodes(1);
-
         // Trigger the creation of the system index
         runnable.run();
         ensureGreen(INDEX_NAME);
@@ -293,8 +288,6 @@ private void doCreateTest(Runnable runnable, String concreteIndex) {
     }
 
     public void testConcurrentAutoCreates() throws InterruptedException {
-        internalCluster().startNodes(3);
-
         final Client client = client();
         final int count = randomIntBetween(5, 30);
         final CountDownLatch latch = new CountDownLatch(count);

server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java

@@ -51,6 +51,7 @@ public void testBulkProcessorAutoCreateRestrictions() {
     }
 
     public void testIndexWithDisabledAutoCreateIndex() {
+        internalCluster().startNode();
         updateClusterSettings(Settings.builder().put(AutoCreateIndex.AUTO_CREATE_INDEX_SETTING.getKey(), randomFrom("-*", "+.*")));
         final BulkItemResponse itemResponse = client().prepareBulk()
             .add(prepareIndex("test-index").setSource("foo", "bar"))

server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java

@@ -251,6 +251,7 @@ public void testAwarenessZonesIncrementalNodes() {
     }
 
     public void testForceAwarenessSettingValidation() {
+        internalCluster().startNode();
         final String prefix = AwarenessAllocationDecider.CLUSTER_ROUTING_ALLOCATION_AWARENESS_FORCE_GROUP_SETTING.getKey();
 
         final IllegalArgumentException illegalArgumentException = expectThrows(

server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java

@@ -186,6 +186,8 @@ public void testDisablingAllocationFiltering() {
     }
 
     public void testInvalidIPFilterClusterSettings() {
+        logger.info("--> starting 2 nodes");
+        internalCluster().startNodes(2);
         String ipKey = randomFrom("_ip", "_host_ip", "_publish_ip");
         var filterSetting = randomFrom(
             FilterAllocationDecider.CLUSTER_ROUTING_REQUIRE_GROUP_SETTING,

server/src/internalClusterTest/java/org/elasticsearch/health/node/ShardsCapacityHealthIndicatorServiceIT.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.health.HealthStatus;
 import org.elasticsearch.health.metadata.HealthMetadata;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.InternalTestCluster;
 import org.junit.After;
 import org.junit.Before;
 
@@ -27,16 +26,14 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false)
 public class ShardsCapacityHealthIndicatorServiceIT extends ESIntegTestCase {
 
     private static final String INDEX_NAME = "index-name";
-    private InternalTestCluster internalCluster;
 
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        internalCluster = internalCluster();
         updateClusterSettings(Settings.builder().put(SETTING_CLUSTER_MAX_SHARDS_PER_NODE.getKey(), 30));
     }
 
@@ -53,7 +50,7 @@ public void testGreen() throws Exception {
         // index: 4 shards + 1 replica = 8 shards used (30 - 8 = 22 > 10 available shards)
         createIndex(4, 1);
 
-        var result = fetchShardsCapacityIndicatorResult(internalCluster);
+        var result = fetchShardsCapacityIndicatorResult();
         assertEquals(result.status(), HealthStatus.GREEN);
         assertEquals(result.symptom(), "The cluster has enough room to add new shards.");
         assertThat(result.diagnosisList(), empty());
@@ -64,7 +61,7 @@ public void testYellow() throws Exception {
         // index: 11 shards + 1 replica = 22 shards used (30 - 22 < 10 available shards)
         createIndex(10, 1);
 
-        var result = fetchShardsCapacityIndicatorResult(internalCluster);
+        var result = fetchShardsCapacityIndicatorResult();
         assertEquals(result.status(), HealthStatus.YELLOW);
         assertEquals(result.symptom(), "Cluster is close to reaching the configured maximum number of shards for data nodes.");
         assertThat(result.diagnosisList(), hasSize(1));
@@ -75,7 +72,7 @@ public void testRed() throws Exception {
         // index: 13 shards + 1 replica = 26 shards used (30 - 26 < 5 available shards)
         createIndex(13, 1);
 
-        var result = fetchShardsCapacityIndicatorResult(internalCluster);
+        var result = fetchShardsCapacityIndicatorResult();
         assertEquals(result.status(), HealthStatus.RED);
         assertEquals(result.symptom(), "Cluster is close to reaching the configured maximum number of shards for data nodes.");
         assertThat(result.diagnosisList(), hasSize(1));
@@ -86,15 +83,15 @@ private void createIndex(int shards, int replicas) {
         createIndex(INDEX_NAME, indexSettings(shards, replicas).build());
     }
 
-    private HealthIndicatorResult fetchShardsCapacityIndicatorResult(InternalTestCluster internalCluster) throws Exception {
-        ensureStableCluster(internalCluster.getNodeNames().length);
-        var healthNode = ESIntegTestCase.waitAndGetHealthNode(internalCluster);
+    private HealthIndicatorResult fetchShardsCapacityIndicatorResult() throws Exception {
+        ensureStableCluster(internalCluster().getNodeNames().length);
+        var healthNode = ESIntegTestCase.waitAndGetHealthNode(internalCluster());
         assertNotNull(healthNode);
 
-        var randomNode = internalCluster.getRandomNodeName();
+        var randomNode = internalCluster().getRandomNodeName();
         waitForShardLimitsMetadata(randomNode);
 
-        var healthService = internalCluster.getInstance(HealthService.class, randomNode);
+        var healthService = internalCluster().getInstance(HealthService.class, randomNode);
         var healthIndicatorResults = getHealthServiceResults(healthService, randomNode);
         assertThat(healthIndicatorResults, hasSize(1));
         return healthIndicatorResults.get(0);

server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestStatsNamesAndTypesIT.java

@@ -36,7 +36,7 @@
 
 import static org.hamcrest.Matchers.equalTo;
 
-@ESIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = ESIntegTestCase.Scope.TEST)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false)
 public class IngestStatsNamesAndTypesIT extends ESIntegTestCase {
 
     @Override

server/src/internalClusterTest/java/org/elasticsearch/rest/RestControllerIT.java

@@ -52,7 +52,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numClientNodes = 1, numDataNodes = 0)
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, supportsDedicatedMasters = false)
 public class RestControllerIT extends ESIntegTestCase {
     @Override
     protected boolean addMockHttpTransport() {

server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverTelemetryIT.java

@@ -30,7 +30,6 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class RetrieverTelemetryIT extends ESIntegTestCase {
 
     private static final String INDEX_NAME = "test_index";

server/src/internalClusterTest/java/org/elasticsearch/snapshots/BlobStoreIncrementalityIT.java

@@ -173,6 +173,8 @@ public void testForceMergeCausesFullSnapshot() throws Exception {
     }
 
     public void testRecordCorrectSegmentCountsWithBackgroundMerges() throws Exception {
+        internalCluster().startMasterOnlyNode();
+        internalCluster().ensureAtLeastNumDataNodes(2);
         final String repoName = "test-repo";
         createRepository(repoName, "fs");
 

server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java

@@ -1480,6 +1480,7 @@ public void testStartWithSuccessfulShardSnapshotPendingFinalization() throws Exc
     }
 
     public void testConcurrentRestoreDeleteAndClone() throws Exception {
+        internalCluster().startNode();
         final String repository = "test-repo";
         createRepository(logger, repository, "fs");
 
@@ -2137,7 +2138,7 @@ public void testQueuedSnapshotAfterPartialWithIndexRecreate() throws Exception {
     }
 
     public void testDeleteIndexWithOutOfOrderFinalization() {
-
+        internalCluster().startNode();
         final var indexToDelete = "index-to-delete";
         final var indexNames = List.of(indexToDelete, "index-0", "index-1", "index-2");
 

server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java

@@ -685,6 +685,7 @@ public void testRestoreShrinkIndex() throws Exception {
     }
 
     public void testSnapshotWithDateMath() {
+        internalCluster().startMasterOnlyNode();
         final String repo = "repo";
 
         final String snapshotName = "<snapshot-{now/d}>";
@@ -712,6 +713,8 @@ public void testSnapshotWithDateMath() {
     }
 
     public void testSnapshotTotalAndIncrementalSizes() throws Exception {
+        internalCluster().startMasterOnlyNode();
+        internalCluster().startDataOnlyNode();
         final String indexName = "test-blocks-1";
         final String repositoryName = "repo-" + indexName;
         final String snapshot0 = "snapshot-0";
@@ -798,6 +801,8 @@ public void testSnapshotTotalAndIncrementalSizes() throws Exception {
     }
 
     public void testDeduplicateIndexMetadata() throws Exception {
+        internalCluster().startMasterOnlyNode();
+        internalCluster().startDataOnlyNode();
         final String indexName = "test-blocks-1";
         final String repositoryName = "repo-" + indexName;
         final String snapshot0 = "snapshot-0";
@@ -968,6 +973,8 @@ public void testDataNodeRestartAfterShardSnapshotFailure() throws Exception {
     }
 
     public void testRetentionLeasesClearedOnRestore() throws Exception {
+        internalCluster().startMasterOnlyNode();
+        internalCluster().startDataOnlyNode();
         final String repoName = "test-repo-retention-leases";
         createRepository(repoName, "fs");
 

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -580,7 +580,7 @@ private void afterInternal(boolean afterClass) throws Exception {
                 internalCluster().clearDisruptionScheme();
             }
             try {
-                if (cluster() != null) {
+                if (cluster() != null && cluster().size() > 0) {
                     if (currentClusterScope != Scope.TEST) {
                         Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
 

test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java

@@ -831,14 +831,11 @@ private static String getRoleSuffix(Settings settings) {
     public Client client() {
         /* Randomly return a client to one of the nodes in the cluster */
         NodeAndClient c = getRandomNodeAndClient();
-        ensureOpen();
         if (c == null) {
-            synchronized (this) {
-                return getOrBuildRandomNode().client();
-            }
-        } else {
-            return c.client();
+            throw new AssertionError("Unable to get client, no node found");
         }
+        ensureOpen();
+        return c.client();
     }
 
     /**

x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportGetAutoscalingCapacityActionIT.java

@@ -10,7 +10,6 @@
 import org.apache.logging.log4j.Level;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.xpack.autoscaling.AutoscalingIntegTestCase;
@@ -28,7 +27,6 @@
     value = "org.elasticsearch.xpack.autoscaling.action.TransportGetAutoscalingCapacityAction:debug",
     reason = "to ensure we log autoscaling capacity response on DEBUG level"
 )
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class TransportGetAutoscalingCapacityActionIT extends AutoscalingIntegTestCase {
 
     public void testCurrentCapacity() throws Exception {

x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/template/IndexTemplateRegistryRolloverIT.java

@@ -36,7 +36,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 
-@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
 public class IndexTemplateRegistryRolloverIT extends ESIntegTestCase {
 
     private ClusterService clusterService;

x-pack/plugin/core/src/test/java/org/elasticsearch/license/ClusterStateLicenseServiceClusterTests.java

@@ -33,8 +33,6 @@ private Settings.Builder nodeSettingsBuilder(int nodeOrdinal, Settings otherSett
     }
 
     public void testClusterRestartWithLicense() throws Exception {
-        wipeAllLicenses();
-
         int numNodes = randomIntBetween(1, 5);
         logger.info("--> starting {} node(s)", numNodes);
         internalCluster().startNodes(numNodes);
@@ -79,7 +77,6 @@ public void testClusterRestartWithLicense() throws Exception {
     }
 
     public void testClusterRestartWhileEnabled() throws Exception {
-        wipeAllLicenses();
         internalCluster().startNode();
         ensureGreen();
         assertLicenseActive(true);
@@ -91,7 +88,6 @@ public void testClusterRestartWhileEnabled() throws Exception {
     }
 
     public void testClusterRestartWhileExpired() throws Exception {
-        wipeAllLicenses();
         internalCluster().startNode();
         ensureGreen();
         assertLicenseActive(true);
@@ -106,7 +102,6 @@ public void testClusterRestartWhileExpired() throws Exception {
 
     public void testClusterRestartWithOldSignature() throws Exception {
         assumeFalse("Can't run in a FIPS JVM. We can't generate old licenses since PBEWithSHA1AndDESede is not available", inFipsJvm());
-        wipeAllLicenses();
         internalCluster().startNode();
         ensureGreen();
         assertLicenseActive(true);

x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AbstractEqlBlockingIntegTestCase.java

@@ -27,7 +27,6 @@
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.tasks.TaskInfo;
-import org.elasticsearch.test.ESIntegTestCase;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -40,15 +39,13 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
-import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
 
 /**
  * IT tests that can block EQL execution at different places
  */
-@ESIntegTestCase.ClusterScope(scope = SUITE, numDataNodes = 0, numClientNodes = 0, maxNumDataNodes = 0)
 public abstract class AbstractEqlBlockingIntegTestCase extends AbstractEqlIntegTestCase {
 
     protected List<SearchBlockPlugin> initBlockFactory(boolean searchBlock, boolean fieldCapsBlock) {