Skip to content

Commit 003bea2

Browse files
authored
[TEST] Run tsdb tests with both base and trial licenses (#115653) (#115851)
* Run tsdb tests with both base and trial licenses. * ignore license error in serverless * update * update * update (cherry picked from commit b97b663)
1 parent a988c03 commit 003bea2

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/DisabledSecurityDataStreamTestCase.java

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public abstract class DisabledSecurityDataStreamTestCase extends ESRestTestCase
2828
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
2929
.distribution(DistributionType.DEFAULT)
3030
.feature(FeatureFlag.FAILURE_STORE_ENABLED)
31-
.setting("xpack.license.self_generated.type", "trial")
3231
.setting("xpack.security.enabled", "false")
3332
.setting("xpack.watcher.enabled", "false")
3433
.build();

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/TsdbDataStreamRestIT.java

+24-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Set;
2626

2727
import static org.elasticsearch.cluster.metadata.DataStreamTestHelper.backingIndexEqualTo;
28-
import static org.hamcrest.Matchers.aMapWithSize;
2928
import static org.hamcrest.Matchers.containsInAnyOrder;
3029
import static org.hamcrest.Matchers.containsString;
3130
import static org.hamcrest.Matchers.empty;
@@ -54,6 +53,7 @@ public class TsdbDataStreamRestIT extends DisabledSecurityDataStreamTestCase {
5453
"number_of_replicas": 1,
5554
"number_of_shards": 2,
5655
"mode": "time_series"
56+
SOURCEMODE
5757
}
5858
},
5959
"mappings":{
@@ -201,15 +201,35 @@ public class TsdbDataStreamRestIT extends DisabledSecurityDataStreamTestCase {
201201
{"@timestamp": "$now", "metricset": "pod", "k8s": {"pod": {"name": "elephant", "uid":"df3145b3-0563-4d3b-a0f7-897eb2876eb4", "ip": "10.10.55.3", "network": {"tx": 1434595272, "rx": 530605511}}}}
202202
""";
203203

204+
private static String getTemplate() {
205+
return TEMPLATE.replace("SOURCEMODE", randomFrom("", """
206+
, "mapping": { "source": { "mode": "stored" } }""", """
207+
, "mapping": { "source": { "mode": "synthetic" } }"""));
208+
}
209+
210+
private static boolean trialStarted = false;
211+
204212
@Before
205213
public void setup() throws IOException {
214+
if (trialStarted == false) {
215+
// Start trial to support synthetic source.
216+
Request startTrial = new Request("POST", "/_license/start_trial");
217+
startTrial.addParameter("acknowledge", "true");
218+
try {
219+
client().performRequest(startTrial);
220+
} catch (Exception e) {
221+
// Ignore failures, the API is not present in Serverless.
222+
}
223+
trialStarted = true;
224+
}
225+
206226
// Add component template:
207227
var request = new Request("POST", "/_component_template/custom_template");
208228
request.setJsonEntity(COMPONENT_TEMPLATE);
209229
assertOK(client().performRequest(request));
210230
// Add composable index template
211231
request = new Request("POST", "/_index_template/1");
212-
request.setJsonEntity(TEMPLATE);
232+
request.setJsonEntity(getTemplate());
213233
assertOK(client().performRequest(request));
214234
}
215235

@@ -220,7 +240,7 @@ public void testTsdbDataStreams() throws Exception {
220240
public void testTsdbDataStreamsNanos() throws Exception {
221241
// Overwrite template to use date_nanos field type:
222242
var putComposableIndexTemplateRequest = new Request("POST", "/_index_template/1");
223-
putComposableIndexTemplateRequest.setJsonEntity(TEMPLATE.replace("date", "date_nanos"));
243+
putComposableIndexTemplateRequest.setJsonEntity(getTemplate().replace("date", "date_nanos"));
224244
assertOK(client().performRequest(putComposableIndexTemplateRequest));
225245

226246
assertTsdbDataStream();
@@ -407,7 +427,6 @@ public void testSimulateTsdbDataStreamTemplate() throws Exception {
407427
var response = client().performRequest(simulateIndexTemplateRequest);
408428
assertOK(response);
409429
var responseBody = entityAsMap(response);
410-
assertThat(ObjectPath.evaluate(responseBody, "template.settings.index"), aMapWithSize(6));
411430
assertThat(ObjectPath.evaluate(responseBody, "template.settings.index.number_of_shards"), equalTo("2"));
412431
assertThat(ObjectPath.evaluate(responseBody, "template.settings.index.number_of_replicas"), equalTo("1"));
413432
assertThat(ObjectPath.evaluate(responseBody, "template.settings.index.mode"), equalTo("time_series"));
@@ -493,7 +512,7 @@ public void testMigrateRegularDataStreamToTsdbDataStream() throws Exception {
493512

494513
// Update template
495514
putComposableIndexTemplateRequest = new Request("POST", "/_index_template/1");
496-
putComposableIndexTemplateRequest.setJsonEntity(TEMPLATE);
515+
putComposableIndexTemplateRequest.setJsonEntity(getTemplate());
497516
assertOK(client().performRequest(putComposableIndexTemplateRequest));
498517

499518
var rolloverRequest = new Request("POST", "/k8s/_rollover");

modules/data-streams/src/yamlRestTest/java/org/elasticsearch/datastreams/DataStreamsClientYamlTestSuiteIT.java

+3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ private static ElasticsearchCluster createCluster() {
5050
.setting("xpack.security.enabled", "true")
5151
.keystore("bootstrap.password", "x-pack-test-password")
5252
.user("x_pack_rest_user", "x-pack-test-password");
53+
if (initTestSeed().nextBoolean()) {
54+
clusterBuilder.setting("xpack.license.self_generated.type", "trial");
55+
}
5356
boolean setNodes = Boolean.parseBoolean(System.getProperty("yaml.rest.tests.set_num_nodes", "true"));
5457
if (setNodes) {
5558
clusterBuilder.nodes(2);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public void append(LogEvent event) {
378378
JAVA_ZONE_IDS = ZoneId.getAvailableZoneIds().stream().filter(unsupportedZoneIdsPredicate.negate()).sorted().toList();
379379
}
380380

381-
static Random initTestSeed() {
381+
protected static Random initTestSeed() {
382382
String inputSeed = System.getProperty("tests.seed");
383383
long seed;
384384
if (inputSeed == null) {

0 commit comments

Comments
 (0)