Skip to content

[9.1] Fix tests in SetSingleNodeAllocateStepTests (#135724) #136158

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
Oct 8, 2025
Merged

[9.1] Fix tests in SetSingleNodeAllocateStepTests (#135724) #136158

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
31 changes: 16 additions & 15 deletions ...n/core/src/test/java/org/elasticsearch/xpack/core/ilm/SetSingleNodeAllocateStepTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.common.settings.Settings.Builder;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.Maps;
import org.elasticsearch.env.BuildVersion;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.IndexVersion;
Expand Down Expand Up @@ -394,11 +395,7 @@ public void testPerformActionAttrsNoShard() {
}

public void testPerformActionSomeShardsOnlyOnNewNodes() throws Exception {
VersionInformation oldVersion = new VersionInformation(
VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersionUtils.randomCompatibleVersion(random())
);
final VersionInformation oldVersion = randomOldVersionInformation();
final int numNodes = randomIntBetween(2, 20); // Need at least 2 nodes to have some nodes on a new version
final int numNewNodes = randomIntBetween(1, numNodes - 1);
final int numOldNodes = numNodes - numNewNodes;
Expand Down Expand Up @@ -459,11 +456,7 @@ public void testPerformActionSomeShardsOnlyOnNewNodes() throws Exception {
}

public void testPerformActionSomeShardsOnlyOnNewNodesButNewNodesInvalidAttrs() {
VersionInformation oldVersion = new VersionInformation(
VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersionUtils.randomCompatibleVersion(random())
);
final var oldVersion = randomOldVersionInformation();
final int numNodes = randomIntBetween(2, 20); // Need at least 2 nodes to have some nodes on a new version
final int numNewNodes = randomIntBetween(1, numNodes - 1);
final int numOldNodes = numNodes - numNewNodes;
Expand Down Expand Up @@ -532,11 +525,7 @@ public void testPerformActionSomeShardsOnlyOnNewNodesButNewNodesInvalidAttrs() {
}

public void testPerformActionNewShardsExistButWithInvalidAttributes() throws Exception {
VersionInformation oldVersion = new VersionInformation(
VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersionUtils.randomCompatibleVersion(random())
);
final VersionInformation oldVersion = randomOldVersionInformation();
final int numNodes = randomIntBetween(2, 20); // Need at least 2 nodes to have some nodes on a new version
final int numNewNodes = randomIntBetween(1, numNodes - 1);
final int numOldNodes = numNodes - numNewNodes;
Expand Down Expand Up @@ -604,6 +593,18 @@ public void testPerformActionNewShardsExistButWithInvalidAttributes() throws Exc
assertNodeSelected(indexMetadata, indexMetadata.getIndex(), oldNodeIds, discoveryNodes, indexRoutingTable.build());
}

private VersionInformation randomOldVersionInformation() {
final var previousVersion = VersionUtils.getPreviousVersion();
final var version = VersionUtils.randomVersionBetween(random(), previousVersion.minimumCompatibilityVersion(), previousVersion);
return new VersionInformation(
BuildVersion.fromVersionId(version.id()),
version,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersionUtils.randomCompatibleVersion(random())
);
}

private Collection<Map.Entry<String, String>> generateRandomValidAttributes(int numAttrs) {
return generateRandomValidAttributes(numAttrs, "");
}
Expand Down