Fix NPE in MlMemoryAutoscalingDecider (elastic#116650) (elastic#116743)

* Fix NPE in MlMemoryAutoscalingDecider * Update docs/changelog/116650.yaml * Update 116650.yaml * Update docs/changelog/116650.yaml * better fix
jakelandis · Nov 13, 2024 · 777d774 · 777d774
1 parent a917d16
commit 777d774
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docs/changelog/116650.yaml b/docs/changelog/116650.yaml
@@ -0,0 +1,5 @@
+pr: 116650
+summary: Fix bug in ML autoscaling when some node info is unavailable
+area: Machine Learning
+type: bug
+issues: []
diff --git a/.../ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingCapacity.java b/.../ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingCapacity.java
@@ -17,7 +17,11 @@ public static Builder builder(ByteSizeValue nodeSize, ByteSizeValue tierSize) {
     }
 
     public static Builder from(AutoscalingCapacity autoscalingCapacity) {
-        return builder(autoscalingCapacity.node().memory(), autoscalingCapacity.total().memory());
+        if (autoscalingCapacity == null) {
+            return builder(null, null);
+        } else {
+            return builder(autoscalingCapacity.node().memory(), autoscalingCapacity.total().memory());
+        }
     }
 
     @Override

diff --git a/...n/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingDecider.java b/...n/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingDecider.java
@@ -809,7 +809,7 @@ static MlMemoryAutoscalingCapacity ensureScaleDown(
         MlMemoryAutoscalingCapacity scaleDownResult,
         MlMemoryAutoscalingCapacity currentCapacity
     ) {
-        if (scaleDownResult == null || currentCapacity == null) {
+        if (scaleDownResult == null || currentCapacity == null || currentCapacity.isUndetermined()) {
             return null;
         }
         MlMemoryAutoscalingCapacity newCapacity = MlMemoryAutoscalingCapacity.builder(