8257746: Regression introduced with JDK-8250984 - memory might be null in some machines

Ekaterina Vergizova · Ekaterina Vergizova · commit 0be19d285688 · 2021-05-13T12:52:53.000Z
Backport-of: abc4300de9c7a298c359fb585d3b0570a98df5cb
diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1Subsystem.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1Subsystem.java
@@ -439,14 +439,14 @@ public long getTcpMemoryUsage() {
     }
 
     public long getMemoryAndSwapFailCount() {
-        if (!memory.isSwapEnabled()) {
+        if (memory != null && !memory.isSwapEnabled()) {
             return getMemoryFailCount();
         }
         return getLongValue(memory, "memory.memsw.failcnt");
     }
 
     public long getMemoryAndSwapLimit() {
-        if (!memory.isSwapEnabled()) {
+        if (memory != null && !memory.isSwapEnabled()) {
             return getMemoryLimit();
         }
         long retval = getLongValue(memory, "memory.memsw.limit_in_bytes");
@@ -464,14 +464,14 @@ public long getMemoryAndSwapLimit() {
     }
 
     public long getMemoryAndSwapMaxUsage() {
-        if (!memory.isSwapEnabled()) {
+        if (memory != null && !memory.isSwapEnabled()) {
             return getMemoryMaxUsage();
         }
         return getLongValue(memory, "memory.memsw.max_usage_in_bytes");
     }
 
     public long getMemoryAndSwapUsage() {
-        if (!memory.isSwapEnabled()) {
+        if (memory != null && !memory.isSwapEnabled()) {
             return getMemoryUsage();
         }
         return getLongValue(memory, "memory.memsw.usage_in_bytes");

Original file line number	Diff line number	Diff line change
`@@ -439,14 +439,14 @@ public long getTcpMemoryUsage() {`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`public long getMemoryAndSwapFailCount() {`
`442`		`- if (!memory.isSwapEnabled()) {`
	`442`	`+ if (memory != null && !memory.isSwapEnabled()) {`
`443`	`443`	`return getMemoryFailCount();`
`444`	`444`	`}`
`445`	`445`	`return getLongValue(memory, "memory.memsw.failcnt");`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`public long getMemoryAndSwapLimit() {`
`449`		`- if (!memory.isSwapEnabled()) {`
	`449`	`+ if (memory != null && !memory.isSwapEnabled()) {`
`450`	`450`	`return getMemoryLimit();`
`451`	`451`	`}`
`452`	`452`	`long retval = getLongValue(memory, "memory.memsw.limit_in_bytes");`
`@@ -464,14 +464,14 @@ public long getMemoryAndSwapLimit() {`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`public long getMemoryAndSwapMaxUsage() {`
`467`		`- if (!memory.isSwapEnabled()) {`
	`467`	`+ if (memory != null && !memory.isSwapEnabled()) {`
`468`	`468`	`return getMemoryMaxUsage();`
`469`	`469`	`}`
`470`	`470`	`return getLongValue(memory, "memory.memsw.max_usage_in_bytes");`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`public long getMemoryAndSwapUsage() {`
`474`		`- if (!memory.isSwapEnabled()) {`
	`474`	`+ if (memory != null && !memory.isSwapEnabled()) {`
`475`	`475`	`return getMemoryUsage();`
`476`	`476`	`}`
`477`	`477`	`return getLongValue(memory, "memory.memsw.usage_in_bytes");`