Skip to content

Commit 95193da

Browse files
authored
Fix test: create enough nodes to make cluster always be able to go green (elastic#113824) (elastic#113881)
* Fix test: create enough nodes to make cluster always be able to go green * Skip test when feature is disabled (cherry picked from commit 852c960)
1 parent b2d05e3 commit 95193da

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRemoteIT.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.client.internal.Client;
1515
import org.elasticsearch.cluster.health.ClusterHealthStatus;
1616
import org.elasticsearch.common.settings.Settings;
17+
import org.elasticsearch.common.util.FeatureFlag;
1718
import org.elasticsearch.core.TimeValue;
1819
import org.elasticsearch.index.query.MatchAllQueryBuilder;
1920
import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -22,6 +23,7 @@
2223
import org.elasticsearch.test.ESIntegTestCase.Scope;
2324
import org.elasticsearch.test.InternalTestCluster;
2425
import org.junit.Assert;
26+
import org.junit.BeforeClass;
2527

2628
import java.util.Collection;
2729
import java.util.List;
@@ -44,6 +46,7 @@ public class ClusterStatsRemoteIT extends AbstractMultiClustersTestCase {
4446
private static final String REMOTE2 = "cluster-b";
4547

4648
private static final String INDEX_NAME = "demo";
49+
private static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
4750

4851
@Override
4952
protected boolean reuseClusters() {
@@ -60,6 +63,11 @@ protected Map<String, Boolean> skipUnavailableForRemoteClusters() {
6063
return Map.of(REMOTE1, false, REMOTE2, true);
6164
}
6265

66+
@BeforeClass
67+
protected static void skipIfTelemetryDisabled() {
68+
assumeTrue("Skipping test as CCS_TELEMETRY_FEATURE_FLAG is disabled", CCS_TELEMETRY_FEATURE_FLAG.isEnabled());
69+
}
70+
6371
public void testRemoteClusterStats() throws ExecutionException, InterruptedException {
6472
setupClusters();
6573
final Client client = client(LOCAL_CLUSTER);
@@ -117,7 +125,7 @@ private void setupClusters() {
117125
int numShardsRemote = randomIntBetween(2, 10);
118126
for (String clusterAlias : remoteClusterAlias()) {
119127
final InternalTestCluster remoteCluster = cluster(clusterAlias);
120-
remoteCluster.ensureAtLeastNumDataNodes(randomIntBetween(1, 3));
128+
remoteCluster.ensureAtLeastNumDataNodes(randomIntBetween(2, 3));
121129
assertAcked(
122130
client(clusterAlias).admin()
123131
.indices()

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ private Map<String, Object> setupClusters() {
662662
int numShardsRemote = randomIntBetween(2, 10);
663663
for (String clusterAlias : remoteClusterAlias()) {
664664
final InternalTestCluster remoteCluster = cluster(clusterAlias);
665-
remoteCluster.ensureAtLeastNumDataNodes(randomIntBetween(1, 3));
665+
remoteCluster.ensureAtLeastNumDataNodes(randomIntBetween(2, 3));
666666
assertAcked(
667667
client(clusterAlias).admin()
668668
.indices()

0 commit comments

Comments
 (0)