Skip to content

Fixing DataStreamsUpgradeIT.testUpgradeDataStream when cluster major version is unchanged #119786

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 1 commit into from
Jan 8, 2025
Merged

Fixing DataStreamsUpgradeIT.testUpgradeDataStream when cluster major version is unchanged #119786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ tests:
- class: org.elasticsearch.search.profile.dfs.DfsProfilerIT
method: testProfileDfs
issue: https://github.com/elastic/elasticsearch/issues/119711
- class: org.elasticsearch.upgrades.DataStreamsUpgradeIT
method: testUpgradeDataStream
issue: https://github.com/elastic/elasticsearch/issues/119717
- class: org.elasticsearch.xpack.esql.optimizer.LocalPhysicalPlanOptimizerTests
method: testSingleMatchFunctionFilterPushdownWithStringValues {default}
issue: https://github.com/elastic/elasticsearch/issues/119720
Expand Down
16 changes: 10 additions & 6 deletions x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,18 +281,22 @@ private void upgradeDataStream(String dataStreamName, int numRolloversOnOldClust
);
assertOK(statusResponse);
assertThat(statusResponseMap.get("complete"), equalTo(true));
// The number of rollovers that will have happened when we call reindex:
final int rolloversPerformedByReindex = explicitRolloverOnNewClusterCount == 0 ? 1 : 0;
final int originalWriteIndex = 1;
assertThat(
statusResponseMap.get("total_indices_in_data_stream"),
equalTo(originalWriteIndex + numRolloversOnOldCluster + explicitRolloverOnNewClusterCount + rolloversPerformedByReindex)
);
if (isOriginalClusterSameMajorVersionAsCurrent()) {
assertThat(
statusResponseMap.get("total_indices_in_data_stream"),
equalTo(originalWriteIndex + numRolloversOnOldCluster + explicitRolloverOnNewClusterCount)
);
// If the original cluster was the same as this one, we don't want any indices reindexed:
assertThat(statusResponseMap.get("total_indices_requiring_upgrade"), equalTo(0));
assertThat(statusResponseMap.get("successes"), equalTo(0));
} else {
// The number of rollovers that will have happened when we call reindex:
final int rolloversPerformedByReindex = explicitRolloverOnNewClusterCount == 0 ? 1 : 0;
assertThat(
statusResponseMap.get("total_indices_in_data_stream"),
equalTo(originalWriteIndex + numRolloversOnOldCluster + explicitRolloverOnNewClusterCount + rolloversPerformedByReindex)
);
/*
* total_indices_requiring_upgrade is made up of: (the original write index) + numRolloversOnOldCluster. The number of
* rollovers on the upgraded cluster is irrelevant since those will not be reindexed.
Expand Down