Skip to content

Fix LogsdbIndexingRollingUpgradeIT #133562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2025
Merged

Fix LogsdbIndexingRollingUpgradeIT #133562

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53fc932
Fix LogsdbIndexingRollingUpgradeIT
martijnvg Aug 26, 2025
b2ca1ed
Merge remote-tracking branch 'es/main' into fix_LogsdbIndexingRolling…
martijnvg Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...rade/src/javaRestTest/java/org/elasticsearch/upgrades/LogsdbIndexingRollingUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.notNullValue;

public class LogsdbIndexingRollingUpgradeIT extends AbstractRollingUpgradeWithSecurityTestCase {
Expand Down Expand Up @@ -78,7 +79,8 @@ public void testIndexing() throws Exception {
if (isOldCluster()) {
startTrial();
enableLogsdbByDefault();
createTemplate(dataStreamName, getClass().getSimpleName().toLowerCase(Locale.ROOT), TEMPLATE);
String templateId = getClass().getSimpleName().toLowerCase(Locale.ROOT);
createTemplate(dataStreamName, templateId, TEMPLATE);

Instant startTime = Instant.now().minusSeconds(60 * 60);
bulkIndex(dataStreamName, 4, 1024, startTime);
Expand All @@ -88,6 +90,8 @@ public void testIndexing() throws Exception {
assertThat(((Map<?, ?>) settings.get("settings")).get("index.mode"), equalTo("logsdb"));
assertThat(((Map<?, ?>) settings.get("defaults")).get("index.mapping.source.mode"), equalTo("SYNTHETIC"));

// check prior to rollover
assertDataStream(dataStreamName, templateId);
ensureGreen(dataStreamName);
search(dataStreamName);
query(dataStreamName);
Expand Down Expand Up @@ -115,9 +119,20 @@ public void testIndexing() throws Exception {
}
}

static void assertDataStream(String dataStreamName, String templateId) throws IOException {
var getDataStreamsRequest = new Request("GET", "/_data_stream/" + dataStreamName);
var getDataStreamResponse = client().performRequest(getDataStreamsRequest);
assertOK(getDataStreamResponse);
var dataStreams = entityAsMap(getDataStreamResponse);
assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.name"), equalTo(dataStreamName));
assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.indices"), hasSize(1));
assertThat(ObjectPath.evaluate(dataStreams, "data_streams.0.template"), equalTo(templateId));
}

static void createTemplate(String dataStreamName, String id, String template) throws IOException {
final String INDEX_TEMPLATE = """
{
"priority": 200,
"index_patterns": ["$DATASTREAM"],
"template": $TEMPLATE,
"data_stream": {
Expand Down