Different fixes

droberts195 · Dec 8, 2023 · 2110130 · 2110130
1 parent 73d1d29
commit 2110130
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ain/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java b/...ain/java/org/elasticsearch/xpack/core/ml/job/process/autodetect/state/ModelSizeStats.java
@@ -533,7 +533,6 @@ public static class Builder {
         public Builder(String jobId) {
             this.jobId = jobId;
             memoryStatus = MemoryStatus.OK;
-            assignmentMemoryBasis = AssignmentMemoryBasis.MODEL_MEMORY_LIMIT;
             categorizationStatus = CategorizationStatus.OK;
             logTime = new Date();
         }

diff --git a/...main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java b/...main/java/org/elasticsearch/xpack/ml/job/process/autodetect/AutodetectProcessManager.java
@@ -1071,7 +1071,8 @@ public ByteSizeValue getOpenProcessMemoryUsage() {
         for (ProcessContext processContext : processByAllocation.values()) {
             if (processContext.getState() == ProcessContext.ProcessStateName.RUNNING) {
                 ModelSizeStats modelSizeStats = processContext.getAutodetectCommunicator().getModelSizeStats();
-                memoryUsedBytes += switch (modelSizeStats.getAssignmentMemoryBasis()) {
+                ModelSizeStats.AssignmentMemoryBasis basis = modelSizeStats.getAssignmentMemoryBasis();
+                memoryUsedBytes += switch (basis != null ? basis : ModelSizeStats.AssignmentMemoryBasis.MODEL_MEMORY_LIMIT) {
                     case MODEL_MEMORY_LIMIT -> modelSizeStats.getModelBytesMemoryLimit();
                     case CURRENT_MODEL_BYTES -> modelSizeStats.getModelBytes();
                     case PEAK_MODEL_BYTES -> Optional.ofNullable(modelSizeStats.getPeakModelBytes()).orElse(modelSizeStats.getModelBytes());