[ML] Prevent NPE reading model memory limit (#35827)

davidkyle · web-flow · commit bb1efac0db5d · 2018-11-22T16:49:03.000Z
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java
@@ -423,7 +423,11 @@ public long estimateMemoryFootprint() {
         if (establishedModelMemory != null && establishedModelMemory > 0) {
             return establishedModelMemory + PROCESS_MEMORY_OVERHEAD.getBytes();
         }
-        return ByteSizeUnit.MB.toBytes(analysisLimits.getModelMemoryLimit()) + PROCESS_MEMORY_OVERHEAD.getBytes();
+        long modelMemoryLimit = AnalysisLimits.PRE_6_1_DEFAULT_MODEL_MEMORY_LIMIT_MB;
+        if (analysisLimits != null && analysisLimits.getModelMemoryLimit() != null) {
+            modelMemoryLimit = analysisLimits.getModelMemoryLimit();
+        }
+        return ByteSizeUnit.MB.toBytes(modelMemoryLimit) + PROCESS_MEMORY_OVERHEAD.getBytes();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,11 @@ public long estimateMemoryFootprint() {`
`423`	`423`	`if (establishedModelMemory != null && establishedModelMemory > 0) {`
`424`	`424`	`return establishedModelMemory + PROCESS_MEMORY_OVERHEAD.getBytes();`
`425`	`425`	`}`
`426`		`- return ByteSizeUnit.MB.toBytes(analysisLimits.getModelMemoryLimit()) + PROCESS_MEMORY_OVERHEAD.getBytes();`
	`426`	`+ long modelMemoryLimit = AnalysisLimits.PRE_6_1_DEFAULT_MODEL_MEMORY_LIMIT_MB;`
	`427`	`+ if (analysisLimits != null && analysisLimits.getModelMemoryLimit() != null) {`
	`428`	`+ modelMemoryLimit = analysisLimits.getModelMemoryLimit();`
	`429`	`+ }`
	`430`	`+ return ByteSizeUnit.MB.toBytes(modelMemoryLimit) + PROCESS_MEMORY_OVERHEAD.getBytes();`
`427`	`431`	`}`
`428`	`432`
`429`	`433`	`/**`