Skip to content

[9.1] [ML] Fix MlAssignmentPlannerUpgradeIT.estMlAssignmentPlannerUpgrade() (#137080) #137104

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

Open
wants to merge 4 commits into
base: 9.1
Choose a base branch
from
Open

[9.1] [ML] Fix MlAssignmentPlannerUpgradeIT.estMlAssignmentPlannerUpgrade() (#137080) #137104

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcacb78
[ML] Fix MlAssignmentPlannerUpgradeIT.estMlAssignmentPlannerUpgrade()…
valeriy42 Oct 24, 2025
6559ada
Merge branch '9.1' into backport/9.1/pr-137080
valeriy42 Oct 24, 2025
f9c6195
Merge branch '9.1' into backport/9.1/pr-137080
valeriy42 Oct 31, 2025
d8af83e
Merge branch '9.1' into backport/9.1/pr-137080
valeriy42 Oct 31, 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
14 changes: 9 additions & 5 deletions ...olling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public class MlAssignmentPlannerUpgradeIT extends AbstractUpgradeTestCase {
RAW_MODEL_SIZE = Base64.getDecoder().decode(BASE_64_ENCODED_MODEL).length;
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/101926")
public void testMlAssignmentPlannerUpgrade() throws Exception {
assumeFalse("This test deploys multiple models which cannot be accommodated on a single processor", IS_SINGLE_PROCESSOR_TEST);

Expand Down Expand Up @@ -186,12 +185,12 @@ private void setupDeployments() throws Exception {
createTrainedModel("old_memory_format", 0, 0);
putModelDefinition("old_memory_format");
putVocabulary(List.of("these", "are", "my", "words"), "old_memory_format");
startDeployment("old_memory_format");
startDeployment("old_memory_format", "started", "low");

createTrainedModel("new_memory_format", ByteSizeValue.ofMb(300).getBytes(), ByteSizeValue.ofMb(10).getBytes());
putModelDefinition("new_memory_format");
putVocabulary(List.of("these", "are", "my", "words"), "new_memory_format");
startDeployment("new_memory_format");
startDeployment("new_memory_format", "started", "low");
}

private void cleanupDeployments() throws IOException {
Expand Down Expand Up @@ -247,10 +246,14 @@ private void deleteTrainedModel(String modelId) throws IOException {
}

private Response startDeployment(String modelId) throws IOException {
return startDeployment(modelId, "started");
return startDeployment(modelId, "started", "normal");
}

private Response startDeployment(String modelId, String waitForState) throws IOException {
return startDeployment(modelId, waitForState, "normal");
}

private Response startDeployment(String modelId, String waitForState, String priority) throws IOException {
String inferenceThreadParamName = "threads_per_allocation";
String modelThreadParamName = "number_of_allocations";
String compatibleHeader = null;
Expand All @@ -270,7 +273,8 @@ private Response startDeployment(String modelId, String waitForState) throws IOE
+ inferenceThreadParamName
+ "=1&"
+ modelThreadParamName
+ "=1"
+ "=1&priority="
+ priority
);
if (compatibleHeader != null) {
request.setOptions(request.getOptions().toBuilder().addHeader("Accept", compatibleHeader).build());
Expand Down