Merge remote-tracking branch 'origin/ad_real_mem_usage' into ad_real_mem_usage

edsavage · edsavage · commit 1f9ea78afd66 · 2025-06-05T14:47:27.000+12:00
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobResultsProvider.java
@@ -1592,9 +1592,7 @@ void calculateEstablishedMemoryUsage(
                 }
                 case SYSTEM_MEMORY_BYTES -> {
                     Long storedSystemMemoryBytes = latestModelSizeStats.getSystemMemoryBytes();
-                    handler.accept(
-                        (storedSystemMemoryBytes != null) ? storedSystemMemoryBytes : latestModelSizeStats.getModelBytes()
-                    );
+                    handler.accept((storedSystemMemoryBytes != null) ? storedSystemMemoryBytes : latestModelSizeStats.getModelBytes());
                     return;
                 }
                 case MAX_SYSTEM_MEMORY_BYTES -> {

Original file line number	Diff line number	Diff line change
`@@ -1592,9 +1592,7 @@ void calculateEstablishedMemoryUsage(`
`1592`	`1592`	`}`
`1593`	`1593`	`case SYSTEM_MEMORY_BYTES -> {`
`1594`	`1594`	`Long storedSystemMemoryBytes = latestModelSizeStats.getSystemMemoryBytes();`
`1595`		`- handler.accept(`
`1596`		`- (storedSystemMemoryBytes != null) ? storedSystemMemoryBytes : latestModelSizeStats.getModelBytes()`
`1597`		`- );`
	`1595`	`+ handler.accept((storedSystemMemoryBytes != null) ? storedSystemMemoryBytes : latestModelSizeStats.getModelBytes());`
`1598`	`1596`	`return;`
`1599`	`1597`	`}`
`1600`	`1598`	`case MAX_SYSTEM_MEMORY_BYTES -> {`