Skip to content
Permalink
Browse files
8257746: Regression introduced with JDK-8250984 - memory might be nul…
…l in some machines

Reviewed-by: sgehwolf
Backport-of: abc4300
  • Loading branch information
Ekaterina Vergizova committed Mar 2, 2021
1 parent a3174be commit c668a0c5317613289c9c7d4cd670b7f3a70eff37
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/java.base/linux/classes/jdk/internal/platform/cgroupv1/Metrics.java
@@ -474,14 +474,14 @@ public long getTcpMemoryUsage() {
}

public long getMemoryAndSwapFailCount() {
if (!memory.isSwapEnabled()) {
if (memory != null && !memory.isSwapEnabled()) {
return getMemoryFailCount();
}
return SubSystem.getLongValue(memory, "memory.memsw.failcnt");
}

public long getMemoryAndSwapLimit() {
if (!memory.isSwapEnabled()) {
if (memory != null && !memory.isSwapEnabled()) {
return getMemoryLimit();
}
long retval = SubSystem.getLongValue(memory, "memory.memsw.limit_in_bytes");
@@ -500,14 +500,14 @@ public long getMemoryAndSwapLimit() {
}

public long getMemoryAndSwapMaxUsage() {
if (!memory.isSwapEnabled()) {
if (memory != null && !memory.isSwapEnabled()) {
return getMemoryMaxUsage();
}
return SubSystem.getLongValue(memory, "memory.memsw.max_usage_in_bytes");
}

public long getMemoryAndSwapUsage() {
if (!memory.isSwapEnabled()) {
if (memory != null && !memory.isSwapEnabled()) {
return getMemoryUsage();
}
return SubSystem.getLongValue(memory, "memory.memsw.usage_in_bytes");

1 comment on commit c668a0c

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on c668a0c Mar 2, 2021

Please sign in to comment.