diff --git a/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java b/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java index f9569ebbad89..856198069fa3 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java @@ -19,19 +19,19 @@ import com.hazelcast.instance.impl.Node; import com.hazelcast.instance.impl.NodeState; import com.hazelcast.instance.impl.OutOfMemoryErrorDispatcher; +import com.hazelcast.internal.memory.MemoryStats; import com.hazelcast.internal.metrics.DoubleGauge; import com.hazelcast.internal.metrics.LongGauge; import com.hazelcast.internal.metrics.MetricsRegistry; import com.hazelcast.logging.ILogger; -import com.hazelcast.internal.memory.MemoryStats; import com.hazelcast.spi.properties.ClusterProperty; import static com.hazelcast.internal.diagnostics.HealthMonitorLevel.OFF; import static com.hazelcast.internal.diagnostics.HealthMonitorLevel.valueOf; +import static com.hazelcast.internal.util.ThreadUtil.createThreadName; import static com.hazelcast.spi.properties.ClusterProperty.HEALTH_MONITORING_DELAY_SECONDS; import static com.hazelcast.spi.properties.ClusterProperty.HEALTH_MONITORING_THRESHOLD_CPU_PERCENTAGE; import static com.hazelcast.spi.properties.ClusterProperty.HEALTH_MONITORING_THRESHOLD_MEMORY_PERCENTAGE; -import static com.hazelcast.internal.util.ThreadUtil.createThreadName; import static java.lang.String.format; import static java.lang.Thread.currentThread; import static java.util.concurrent.TimeUnit.SECONDS; @@ -445,7 +445,10 @@ private void renderNativeMemory() { return; } + final long maxNative = memoryStats.getMaxNative(); final long usedNative = memoryStats.getUsedNative(); + final long usedMeta = memoryStats.getUsedMetadata(); + sb.append("native.memory.used=") .append(numberToUnit(usedNative)).append(", "); sb.append("native.memory.free=") @@ -453,17 +456,13 @@ private void renderNativeMemory() { sb.append("native.memory.total=") .append(numberToUnit(memoryStats.getCommittedNative())).append(", "); sb.append("native.memory.max=") - .append(numberToUnit(memoryStats.getMaxNative())).append(", "); - final long maxMeta = memoryStats.getMaxMetadata(); - if (maxMeta > 0) { - final long usedMeta = memoryStats.getUsedMetadata(); - sb.append("native.meta.memory.used=") - .append(numberToUnit(usedMeta)).append(", "); - sb.append("native.meta.memory.free=") - .append(numberToUnit(maxMeta - usedMeta)).append(", "); - sb.append("native.meta.memory.percentage=") - .append(percentageString(PERCENTAGE_MULTIPLIER * usedMeta / (usedNative + usedMeta))).append(", "); - } + .append(numberToUnit(maxNative)).append(", "); + sb.append("native.meta.memory.used=") + .append(numberToUnit(usedMeta)).append(", "); + sb.append("native.meta.memory.free=") + .append(numberToUnit(maxNative - usedMeta)).append(", "); + sb.append("native.meta.memory.percentage=") + .append(percentageString(PERCENTAGE_MULTIPLIER * usedMeta / maxNative)).append(", "); } private void renderExecutors() {