From ef7b36a9f8c4482881e53532b2f3ea2a737e4bb4 Mon Sep 17 00:00:00 2001 From: Max Hniebergall Date: Wed, 16 Oct 2024 16:55:11 -0400 Subject: [PATCH 1/3] Avoid NPE in maybeStartAllocation --- .../adaptiveallocations/AdaptiveAllocationsScalerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/adaptiveallocations/AdaptiveAllocationsScalerService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/adaptiveallocations/AdaptiveAllocationsScalerService.java index 9624d619ff20a..c1b674296f36c 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/adaptiveallocations/AdaptiveAllocationsScalerService.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/adaptiveallocations/AdaptiveAllocationsScalerService.java @@ -434,7 +434,7 @@ public boolean maybeStartAllocation(TrainedModelAssignment assignment) { if (assignment.getAdaptiveAllocationsSettings() != null && assignment.getAdaptiveAllocationsSettings().getEnabled() == Boolean.TRUE && (assignment.getAdaptiveAllocationsSettings().getMinNumberOfAllocations() == null - || assignment.getAdaptiveAllocationsSettings().getMinNumberOfAllocations() == 0)) { + || Integer.valueOf(0).equals(assignment.getAdaptiveAllocationsSettings().getMinNumberOfAllocations()))) { // Prevent against a flurry of scale up requests. if (deploymentIdsWithInFlightScaleFromZeroRequests.contains(assignment.getDeploymentId()) == false) { From f03dcdd3d008594e4614ed2c094f9bc42a79485b Mon Sep 17 00:00:00 2001 From: Max Hniebergall <137079448+maxhniebergall@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:01:37 -0400 Subject: [PATCH 2/3] Update docs/changelog/114958.yaml --- docs/changelog/114958.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/114958.yaml diff --git a/docs/changelog/114958.yaml b/docs/changelog/114958.yaml new file mode 100644 index 0000000000000..b72f33f78a6bf --- /dev/null +++ b/docs/changelog/114958.yaml @@ -0,0 +1,5 @@ +pr: 114958 +summary: Avoid NPE in `maybeStartAllocation` in `AdaptiveAllocations` +area: Machine Learning +type: bug +issues: [] From 9a4108d515d1eabaceb745e097db7ce8cfd407fe Mon Sep 17 00:00:00 2001 From: Max Hniebergall <137079448+maxhniebergall@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:03:24 -0400 Subject: [PATCH 3/3] Delete docs/changelog/114958.yaml --- docs/changelog/114958.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 docs/changelog/114958.yaml diff --git a/docs/changelog/114958.yaml b/docs/changelog/114958.yaml deleted file mode 100644 index b72f33f78a6bf..0000000000000 --- a/docs/changelog/114958.yaml +++ /dev/null @@ -1,5 +0,0 @@ -pr: 114958 -summary: Avoid NPE in `maybeStartAllocation` in `AdaptiveAllocations` -area: Machine Learning -type: bug -issues: []