Skip to content

Commit 777d774

Browse files
authored
Fix NPE in MlMemoryAutoscalingDecider (#116650) (#116743)
* Fix NPE in MlMemoryAutoscalingDecider * Update docs/changelog/116650.yaml * Update 116650.yaml * Update docs/changelog/116650.yaml * better fix
1 parent a917d16 commit 777d774

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

docs/changelog/116650.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116650
2+
summary: Fix bug in ML autoscaling when some node info is unavailable
3+
area: Machine Learning
4+
type: bug
5+
issues: []

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingCapacity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ public static Builder builder(ByteSizeValue nodeSize, ByteSizeValue tierSize) {
1717
}
1818

1919
public static Builder from(AutoscalingCapacity autoscalingCapacity) {
20-
return builder(autoscalingCapacity.node().memory(), autoscalingCapacity.total().memory());
20+
if (autoscalingCapacity == null) {
21+
return builder(null, null);
22+
} else {
23+
return builder(autoscalingCapacity.node().memory(), autoscalingCapacity.total().memory());
24+
}
2125
}
2226

2327
@Override

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/autoscaling/MlMemoryAutoscalingDecider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ static MlMemoryAutoscalingCapacity ensureScaleDown(
809809
MlMemoryAutoscalingCapacity scaleDownResult,
810810
MlMemoryAutoscalingCapacity currentCapacity
811811
) {
812-
if (scaleDownResult == null || currentCapacity == null) {
812+
if (scaleDownResult == null || currentCapacity == null || currentCapacity.isUndetermined()) {
813813
return null;
814814
}
815815
MlMemoryAutoscalingCapacity newCapacity = MlMemoryAutoscalingCapacity.builder(

0 commit comments

Comments
 (0)