From 24a130e3d2aa15c484091621b28d950a9a350461 Mon Sep 17 00:00:00 2001 From: spricoder Date: Tue, 11 Jun 2024 23:39:14 +0800 Subject: [PATCH 1/2] fix missing memory metric --- .../iotdb/metrics/metricsets/system/SystemMetrics.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java index 27f31bf09aa19..3b98b881b2f94 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java @@ -169,6 +169,7 @@ private void collectSystemMemInfo(AbstractMetricService metricService) { a -> osMxBean.getCommittedVirtualMemorySize(), SystemTag.NAME.toString(), SYSTEM); + logger.info("System type: {}", CONFIG.getSystemType()); if (CONFIG.getSystemType() == SystemType.LINUX) { metricService.createAutoGauge( SystemMetric.LINUX_MEMORY_SIZE.toString(), @@ -227,11 +228,11 @@ private void updateLinuxSystemMemInfo() { result.append(line).append("\n"); } } - String[] lines = result.toString().split("\n"); + String[] lines = result.toString().trim().split("\n"); // if failed to get result if (lines.length >= 2) { String[] memParts = lines[1].trim().split("\\s+"); - if (memParts.length == linuxMemoryTitles.length) { + if (memParts.length >= linuxMemoryTitles.length) { usedMemory = Long.parseLong(memParts[2]) * 1024; sharedMemory = Long.parseLong(memParts[4]) * 1024; buffCacheMemory = Long.parseLong(memParts[5]) * 1024; From 01d99a72d366530d9c7b9f2e264872656ddf80f8 Mon Sep 17 00:00:00 2001 From: spricoder Date: Tue, 11 Jun 2024 23:41:40 +0800 Subject: [PATCH 2/2] remove the print of type --- .../apache/iotdb/metrics/metricsets/system/SystemMetrics.java | 1 - 1 file changed, 1 deletion(-) diff --git a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java index 3b98b881b2f94..1cacf2bf6f5f7 100644 --- a/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java +++ b/iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/system/SystemMetrics.java @@ -169,7 +169,6 @@ private void collectSystemMemInfo(AbstractMetricService metricService) { a -> osMxBean.getCommittedVirtualMemorySize(), SystemTag.NAME.toString(), SYSTEM); - logger.info("System type: {}", CONFIG.getSystemType()); if (CONFIG.getSystemType() == SystemType.LINUX) { metricService.createAutoGauge( SystemMetric.LINUX_MEMORY_SIZE.toString(),