24
24
import org .elasticsearch .common .bytes .BytesReference ;
25
25
import org .elasticsearch .common .settings .Settings ;
26
26
import org .elasticsearch .common .util .CollectionUtils ;
27
+ import org .elasticsearch .common .util .FeatureFlag ;
27
28
import org .elasticsearch .core .TimeValue ;
28
29
import org .elasticsearch .index .query .MatchAllQueryBuilder ;
29
30
import org .elasticsearch .plugins .Plugin ;
36
37
import org .elasticsearch .test .InternalTestCluster ;
37
38
import org .elasticsearch .usage .UsageService ;
38
39
import org .junit .Assert ;
40
+ import org .junit .BeforeClass ;
39
41
import org .junit .Rule ;
40
42
import org .junit .rules .TestRule ;
41
43
import org .junit .runner .Description ;
@@ -66,6 +68,7 @@ public class CCSUsageTelemetryIT extends AbstractMultiClustersTestCase {
66
68
private static final Logger LOGGER = LogManager .getLogger (CCSUsageTelemetryIT .class );
67
69
private static final String REMOTE1 = "cluster-a" ;
68
70
private static final String REMOTE2 = "cluster-b" ;
71
+ private static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag ("ccs_telemetry" );
69
72
70
73
@ Override
71
74
protected boolean reuseClusters () {
@@ -80,6 +83,11 @@ protected Collection<String> remoteClusterAlias() {
80
83
@ Rule
81
84
public SkipUnavailableRule skipOverride = new SkipUnavailableRule (REMOTE1 , REMOTE2 );
82
85
86
+ @ BeforeClass
87
+ protected static void skipIfTelemetryDisabled () {
88
+ assumeTrue ("Skipping test as CCS_TELEMETRY_FEATURE_FLAG is disabled" , CCS_TELEMETRY_FEATURE_FLAG .isEnabled ());
89
+ }
90
+
83
91
@ Override
84
92
protected Map <String , Boolean > skipUnavailableForRemoteClusters () {
85
93
var map = skipOverride .getMap ();
@@ -443,7 +451,7 @@ public void testRemoteTimesOut() throws Exception {
443
451
// partial failure, and we disable partial results..
444
452
searchRequest .setCcsMinimizeRoundtrips (true );
445
453
446
- TimeValue searchTimeout = new TimeValue (200 , TimeUnit .MILLISECONDS );
454
+ TimeValue searchTimeout = new TimeValue (500 , TimeUnit .MILLISECONDS );
447
455
// query builder that will sleep for the specified amount of time in the query phase
448
456
SlowRunningQueryBuilder slowRunningQueryBuilder = new SlowRunningQueryBuilder (searchTimeout .millis () * 5 , remoteIndex );
449
457
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder ().query (slowRunningQueryBuilder ).timeout (searchTimeout );
0 commit comments