From 4fe634ecabc21ad0139a67771b3631c17cca9f2a Mon Sep 17 00:00:00 2001 From: Ahmet Mircik Date: Tue, 22 Jun 2021 13:54:11 +0300 Subject: [PATCH 1/3] wip --- .../hazelcast/internal/diagnostics/HealthMonitor.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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..1beb07a76e4f 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; @@ -460,9 +460,10 @@ private void renderNativeMemory() { sb.append("native.meta.memory.used=") .append(numberToUnit(usedMeta)).append(", "); sb.append("native.meta.memory.free=") - .append(numberToUnit(maxMeta - usedMeta)).append(", "); + .append(usedMeta >= maxMeta ? 0 : numberToUnit(maxMeta - usedMeta)).append(", "); sb.append("native.meta.memory.percentage=") - .append(percentageString(PERCENTAGE_MULTIPLIER * usedMeta / (usedNative + usedMeta))).append(", "); + .append(usedMeta >= maxMeta ? percentageString(PERCENTAGE_MULTIPLIER) + : percentageString(PERCENTAGE_MULTIPLIER * usedMeta / (usedNative + usedMeta))).append(", "); } } From 8f6177537c4df7dbb2b3cd85e4caaa27d26c1a56 Mon Sep 17 00:00:00 2001 From: Ahmet Mircik Date: Wed, 23 Jun 2021 13:27:36 +0300 Subject: [PATCH 2/3] reviews --- .../com/hazelcast/internal/diagnostics/HealthMonitor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1beb07a76e4f..3ec10f986140 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java @@ -460,10 +460,10 @@ private void renderNativeMemory() { sb.append("native.meta.memory.used=") .append(numberToUnit(usedMeta)).append(", "); sb.append("native.meta.memory.free=") - .append(usedMeta >= maxMeta ? 0 : numberToUnit(maxMeta - usedMeta)).append(", "); + .append(usedMeta >= maxMeta ? "0" : numberToUnit(maxMeta - usedMeta)).append(", "); sb.append("native.meta.memory.percentage=") .append(usedMeta >= maxMeta ? percentageString(PERCENTAGE_MULTIPLIER) - : percentageString(PERCENTAGE_MULTIPLIER * usedMeta / (usedNative + usedMeta))).append(", "); + : percentageString(PERCENTAGE_MULTIPLIER * usedMeta / usedNative)).append(", "); } } From ca0c771a7c18ec3027e3cd3c517d933558067b73 Mon Sep 17 00:00:00 2001 From: Ahmet Mircik Date: Wed, 23 Jun 2021 13:40:24 +0300 Subject: [PATCH 3/3] reviews 2 --- .../internal/diagnostics/HealthMonitor.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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 3ec10f986140..856198069fa3 100644 --- a/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java +++ b/hazelcast/src/main/java/com/hazelcast/internal/diagnostics/HealthMonitor.java @@ -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,18 +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(usedMeta >= maxMeta ? "0" : numberToUnit(maxMeta - usedMeta)).append(", "); - sb.append("native.meta.memory.percentage=") - .append(usedMeta >= maxMeta ? percentageString(PERCENTAGE_MULTIPLIER) - : percentageString(PERCENTAGE_MULTIPLIER * usedMeta / usedNative)).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() {