Skip to content

Tweak TextRollingUpgradeIT and MatchOnlyTextRollingUpgradeIT #135636

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 3 commits into from
Oct 2, 2025
Merged

Tweak TextRollingUpgradeIT and MatchOnlyTextRollingUpgradeIT #135636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19c7080
Tweak TextRollingUpgradeIT and MatchOnlyTextRollingUpgradeIT
martijnvg Sep 29, 2025
ce468e9
Merge remote-tracking branch 'es/main' into bwc_test_a_phrase_query
martijnvg Sep 30, 2025
cf77c04
Merge remote-tracking branch 'es/main' into bwc_test_a_phrase_query
martijnvg Oct 2, 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
24 changes: 22 additions & 2 deletions ...grade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,23 @@ public void testIndexing() throws Exception {
// when/then - run some queries and verify results
ensureGreen(DATA_STREAM);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

} else if (isMixedCluster()) {
// when
bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);

// when/then
ensureGreen(DATA_STREAM);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

} else if (isUpgradedCluster()) {
// when/then
ensureGreen(DATA_STREAM);
bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

// when/then continued - force merge all shard segments into one
Expand Down Expand Up @@ -244,6 +245,25 @@ void search(String dataStreamName) throws Exception {
assertThat(totalCount, greaterThanOrEqualTo(NUM_REQUESTS * NUM_DOCS_PER_REQUEST));
}

private void phraseSearch(String dataStreamName) throws Exception {
var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
searchRequest.addParameter("pretty", "true");
searchRequest.setJsonEntity("""
{
"query": {
"match_phrase": {
"message": "$smallestMessage"
}
}
}
""".replace("$smallestMessage", smallestMessage));
var response = client().performRequest(searchRequest);
assertOK(response);
var responseBody = entityAsMap(response);
logger.info("{}", responseBody);
assertThat(ObjectPath.evaluate(responseBody, "hits.total.value"), greaterThanOrEqualTo(1));
}

private void query(String dataStreamName) throws Exception {
var queryRequest = new Request("POST", "/_query");
queryRequest.addParameter("pretty", "true");
Expand Down
27 changes: 23 additions & 4 deletions ...olling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TextRollingUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ public TextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
}

public void testIndexing() throws Exception {

if (isOldCluster()) {
// given - enable logsdb and create a template
startTrial();
Expand All @@ -111,22 +110,23 @@ public void testIndexing() throws Exception {
// when/then - run some queries and verify results
ensureGreen(DATA_STREAM);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

} else if (isMixedCluster()) {
// when
bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);

// when/then
ensureGreen(DATA_STREAM);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

} else if (isUpgradedCluster()) {
// when/then
ensureGreen(DATA_STREAM);
bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
search(DATA_STREAM);
phraseSearch(DATA_STREAM);
query(DATA_STREAM);

// when/then continued - force merge all shard segments into one
Expand Down Expand Up @@ -232,7 +232,7 @@ private void recordSmallestMessage(final String message) {
}
}

void search(String dataStreamName) throws Exception {
private void search(String dataStreamName) throws Exception {
var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
searchRequest.addParameter("pretty", "true");
searchRequest.setJsonEntity("""
Expand All @@ -249,6 +249,25 @@ void search(String dataStreamName) throws Exception {
assertThat(totalCount, greaterThanOrEqualTo(NUM_REQUESTS * NUM_DOCS_PER_REQUEST));
}

private void phraseSearch(String dataStreamName) throws Exception {
var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
searchRequest.addParameter("pretty", "true");
searchRequest.setJsonEntity("""
{
"query": {
"match_phrase": {
"message": "$smallestMessage"
}
}
}
""".replace("$smallestMessage", smallestMessage));
var response = client().performRequest(searchRequest);
assertOK(response);
var responseBody = entityAsMap(response);
logger.info("{}", responseBody);
assertThat(ObjectPath.evaluate(responseBody, "hits.total.value"), greaterThanOrEqualTo(1));
}

private void query(String dataStreamName) throws Exception {
var queryRequest = new Request("POST", "/_query");
queryRequest.addParameter("pretty", "true");
Expand Down