This is an automated email from the ASF dual-hosted git repository. marklau99 pushed a commit to branch cpu-monitor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fe815fc559b503d5cecc1f5fc6aeafb52520c11d Author: Liu Xuxin <[email protected]> AuthorDate: Wed May 31 17:15:22 2023 +0800 edit according to review --- .../iotdb/metrics/metricsets/cpu/CpuUsageMetrics.java | 1 + .../iotdb/commons/concurrent/ThreadPoolMetrics.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/cpu/CpuUsageMetrics.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/cpu/CpuUsageMetrics.java index 3ffabea3f79..b2896d1e130 100644 --- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/cpu/CpuUsageMetrics.java +++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/cpu/CpuUsageMetrics.java @@ -199,6 +199,7 @@ public class CpuUsageMetrics implements IMetricSet { totalIncrementTime); lastThreadCpuTime.clear(); lastThreadCpuTime.putAll(currentThreadCpuTime); + lastThreadUserTime.clear(); lastThreadUserTime.putAll(currentThreadUserTime); } diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadPoolMetrics.java b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadPoolMetrics.java index 628d1309355..6e09d7153f1 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadPoolMetrics.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadPoolMetrics.java @@ -34,6 +34,8 @@ public class ThreadPoolMetrics implements IMetricSet { private static final String THREAD_POOL_DONE_TASK_COUNT = "thread_pool_done_task_count"; private static final String THREAD_POOL_WAITING_TASK_COUNT = "thread_pool_waiting_task_count"; private static final String THREAD_POOL_CORE_SIZE = "thread_pool_core_size"; + private static final String THREAD_POOL_MAX_POOL_SIZE = "thread_pool_max_pool_size"; + private static final String THREAD_POOL_LARGEST_POOL_SIZE = "thread_pool_largest_pool_size"; private static final String POOL_NAME = "pool_name"; private AbstractMetricService metricService; private Map<String, IThreadPoolMBean> notRegisteredPoolMap = new HashMap<>(); @@ -79,6 +81,20 @@ public class ThreadPoolMetrics implements IMetricSet { map -> registeredPoolMap.get(name).getCompletedTaskCount(), POOL_NAME, name); + metricService.createAutoGauge( + THREAD_POOL_MAX_POOL_SIZE, + MetricLevel.IMPORTANT, + registeredPoolMap, + map -> registeredPoolMap.get(name).getMaximumPoolSize(), + POOL_NAME, + name); + metricService.createAutoGauge( + THREAD_POOL_LARGEST_POOL_SIZE, + MetricLevel.IMPORTANT, + registeredPoolMap, + map -> registeredPoolMap.get(name).getLargestPoolSize(), + POOL_NAME, + name); } } }
