From a552daa659496ba2aba80de7989f107f57f122f4 Mon Sep 17 00:00:00 2001 From: Valeriy Khakhutskyy <1292899+valeriy42@users.noreply.github.com> Date: Fri, 24 Oct 2025 10:14:39 +0200 Subject: [PATCH 1/2] Refactor MlAssignmentPlannerUpgradeIT to include deployment priority in startDeployment method --- .../upgrades/MlAssignmentPlannerUpgradeIT.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java index 07d9de3dea6ac..6cddbfef2febf 100644 --- a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java +++ b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java @@ -187,12 +187,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 { @@ -248,10 +248,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; @@ -271,7 +275,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()); From 8db08c9e47cb2848695eeb9a07994101db1eb71c Mon Sep 17 00:00:00 2001 From: Valeriy Khakhutskyy <1292899+valeriy42@users.noreply.github.com> Date: Fri, 24 Oct 2025 10:19:03 +0200 Subject: [PATCH 2/2] Remoe AwaitFix --- .../org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java index 6cddbfef2febf..e8443bef65436 100644 --- a/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java +++ b/x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlAssignmentPlannerUpgradeIT.java @@ -67,7 +67,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);