This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch add-confignode-cpu-metric
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/add-confignode-cpu-metric by
this push:
new 45bf23dcf00 add cpu metrics to confignode startup
45bf23dcf00 is described below
commit 45bf23dcf007118b10777e65a875ace810c7613b
Author: Liu Xuxin <[email protected]>
AuthorDate: Sun Jun 25 16:27:46 2023 +0800
add cpu metrics to confignode startup
---
.../iotdb/confignode/manager/cq/CQManager.java | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 21 +++
.../iotdb/trigger/StatisticsUpdaterTrigger.java | 3 +-
...DataNodeThreadModule.java => ThreadModule.java} | 8 +-
.../iotdb/commons/concurrent/ThreadName.java | 164 +++++++++++----------
.../db/service/metrics/DataNodeMetricsHelper.java | 7 +-
6 files changed, 120 insertions(+), 85 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/cq/CQManager.java
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/cq/CQManager.java
index c0daea8687e..efa4b82f496 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/cq/CQManager.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/cq/CQManager.java
@@ -63,7 +63,7 @@ public class CQManager {
this.lock = new ReentrantReadWriteLock();
this.executor =
IoTDBThreadPoolFactory.newScheduledThreadPool(
- CONF.getCqSubmitThread(), ThreadName.CQ_MANAGER.getName());
+ CONF.getCqSubmitThread(), ThreadName.CQ_SCHEDULER.getName());
}
public TSStatus createCQ(TCreateCQReq req) {
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 9b6dad567f3..94ab7cc8c9c 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -22,6 +22,8 @@ package org.apache.iotdb.confignode.service;
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.concurrent.ThreadModule;
+import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.service.JMXService;
@@ -44,6 +46,7 @@ import org.apache.iotdb.db.service.metrics.ProcessMetrics;
import org.apache.iotdb.db.service.metrics.SystemMetrics;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.metricsets.UpTimeMetrics;
+import org.apache.iotdb.metrics.metricsets.cpu.CpuUsageMetrics;
import org.apache.iotdb.metrics.metricsets.disk.DiskMetrics;
import org.apache.iotdb.metrics.metricsets.jvm.JvmMetrics;
import org.apache.iotdb.metrics.metricsets.logback.LogbackMetrics;
@@ -55,6 +58,9 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.TimeUnit;
public class ConfigNode implements ConfigNodeMBean {
@@ -237,6 +243,21 @@ public class ConfigNode implements ConfigNodeMBean {
MetricService.getInstance().addMetricSet(new SystemMetrics(false));
MetricService.getInstance().addMetricSet(new
DiskMetrics(IoTDBConstant.CN_ROLE));
MetricService.getInstance().addMetricSet(new
NetMetrics(IoTDBConstant.CN_ROLE));
+ initCpuMetrics();
+ }
+
+ private void initCpuMetrics() {
+ List<String> threadModules = new ArrayList<>();
+ Arrays.stream(ThreadModule.values()).forEach(x ->
threadModules.add(x.toString()));
+ List<String> pools = new ArrayList<>();
+ Arrays.stream(ThreadName.values()).forEach(x -> pools.add(x.name()));
+ MetricService.getInstance()
+ .addMetricSet(
+ new CpuUsageMetrics(
+ threadModules,
+ pools,
+ x -> ThreadName.getModuleTheThreadBelongs(x).toString(),
+ x -> ThreadName.getThreadPoolTheThreadBelongs(x).name()));
}
private void initConfigManager() {
diff --git
a/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java
b/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java
index 8087ef1c03b..8c3c0236824 100644
---
a/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java
+++
b/example/trigger/src/main/java/org/apache/iotdb/trigger/StatisticsUpdaterTrigger.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.trigger;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
-import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
@@ -61,7 +60,7 @@ public class StatisticsUpdaterTrigger implements Trigger {
private final ScheduledExecutorService triggerInformationUpdateExecutor =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
- ThreadName.TRIGGER_STATISTIC_UPDATER.getName());
+ "Stateful-Trigger-Statistics-Updater");
private static final long UPDATE_INTERVAL = 1000 * 20L;
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/DataNodeThreadModule.java
b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadModule.java
similarity index 90%
rename from
node-commons/src/main/java/org/apache/iotdb/commons/concurrent/DataNodeThreadModule.java
rename to
node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadModule.java
index f0d61466497..3b6699fc1bf 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/DataNodeThreadModule.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadModule.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.commons.concurrent;
-public enum DataNodeThreadModule {
+public enum ThreadModule {
QUERY,
MPP,
COMPACTION,
@@ -34,6 +34,12 @@ public enum DataNodeThreadModule {
JVM,
LOG_BACK,
METRICS,
+ RPC,
+ WRITE,
+ HEARTBEAT,
+ LOAD_BALANCE,
+ REGION_MANAGEMENT,
+ RECOVER,
OTHER,
UNKNOWN
}
diff --git
a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
index cb2507078a7..b62c0f974d9 100644
---
a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
+++
b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ThreadName.java
@@ -28,19 +28,19 @@ public enum ThreadName {
QUERY_WORKER("Query-Worker-Thread"),
QUERY_SENTINEL("Query-Sentinel-Thread"),
TIMED_QUERY_SQL_COUNT("Timed-Query-SQL-Count"),
- MPP_DATA_EXCHANGE_TASK_EXECUTOR("MPP-Data-Exchange-Task-Executors"),
FRAGMENT_INSTANCE_MANAGEMENT("Fragment-Instance-Management"),
FRAGMENT_INSTANCE_NOTIFICATION("Fragment-Instance-Notification"),
- DATANODE_INTERNAL_RPC_SERVICE("DataNodeInternalRPC-Service"),
- DATANODE_INTERNAL_RPC_PROCESSOR("DataNodeInternalRPC-Processor"),
DRIVER_TASK_SCHEDULER_NOTIFICATION("Driver-Task-Scheduler-Notification"),
// -------------------------- MPP --------------------------
MPP_COORDINATOR_SCHEDULED_EXECUTOR("MPP-Coordinator-Scheduled-Executor"),
-
+ MPP_DATA_EXCHANGE_TASK_EXECUTOR("MPP-Data-Exchange-Task-Executors"),
ASYNC_DATANODE_CLIENT_POOL("AsyncDataNodeInternalServiceClientPool"),
MPP_DATA_EXCHANGE_RPC_SERVICE("MPPDataExchangeRPC-Service"),
MPP_DATA_EXCHANGE_RPC_PROCESSOR("MPPDataExchangeRPC-Processor"),
MPP_COORDINATOR_EXECUTOR_POOL("MPP-Coordinator-Executor"),
+ DATANODE_INTERNAL_RPC_SERVICE("DataNodeInternalRPC-Service"),
+ DATANODE_INTERNAL_RPC_PROCESSOR("DataNodeInternalRPC-Processor"),
+ MPP_COORDINATOR_WRITE_EXECUTOR("MPP-Coordinator-Write-Executor"),
ASYNC_DATANODE_MPP_DATA_EXCHANGE_CLIENT_POOL("AsyncDataNodeMPPDataExchangeServiceClientPool"),
// -------------------------- Compaction --------------------------
@@ -53,8 +53,6 @@ public enum ThreadName {
WAL_DELETE("WAL-Delete"),
WAL_RECOVER("WAL-Recover"),
TSFILE_RECOVER("TsFile-Recover"),
- // -------------------------- Write --------------------------
- MPP_COORDINATOR_WRITE_EXECUTOR("MPP-Coordinator-Write-Executor"),
// -------------------------- Flush --------------------------
FLUSH("Flush"),
FLUSH_SUB_TASK("Flush-SubTask"),
@@ -74,19 +72,16 @@ public enum ThreadName {
// -------------------------- ConfigNode-RPC --------------------------
CONFIGNODE_RPC_SERVICE("ConfigNodeRPC-Service"),
CONFIGNODE_RPC_PROCESSOR("ConfigNodeRPC-Processor"),
-
ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL("AsyncConfigNodeHeartbeatServiceClientPool"),
-
ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL("AsyncDataNodeHeartbeatServiceClientPool"),
ASYNC_CONFIGNODE_CLIENT_POOL("AsyncConfigNodeIServiceClientPool"),
// -------------------------- ConfigNode-Query --------------------------
- CQ_MANAGER("CQ-Scheduler"),
CQ_SCHEDULER("CQ-Scheduler"),
- TRIGGER_STATISTIC_UPDATER("Stateful-Trigger-Statistics-Updater"),
- CONFIG_NODE_RETRY_FAILED_TASK("Cluster-RetryFailedTasks-Service"),
// -------------------------- ConfigNode-Write --------------------------
CONFIG_NODE_SAMPLE_CONSENSUS_WAL_FLUSH("ConfigNode-Simple-Consensus-WAL-Flush-Thread"),
// -------------------------- ConfigNode-Heartbeat --------------------------
CONFIG_NODE_HEART_BEAT_SERVICE("Cluster-Heartbeat-Service"),
- // -------------------------- ConfigNode-Compute --------------------------
+
ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL("AsyncConfigNodeHeartbeatServiceClientPool"),
+
ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL("AsyncDataNodeHeartbeatServiceClientPool"),
+ // -------------------------- ConfigNode-LoadBalance
--------------------------
CONFIG_NODE_LOAD_STATISTIC("Cluster-LoadStatistics-Service"),
// -------------------------- ConfigNode-RegionManagement
--------------------------
CONFIG_NODE_REGION_MAINTAINER("IoTDB-Region-Maintainer"),
@@ -150,6 +145,7 @@ public enum ThreadName {
// -------------------------- Metrics --------------------------
SYSTEM_SCHEDULE_METRICS("SystemScheduleMetrics"),
RESOURCE_CONTROL_DISK_STATISTIC("ResourceControl-DataRegionDiskStatistics"),
+ PROMETHEUS_REACTOR_HTTP_EPOLL("reactor-http-epoll"),
PROMETHEUS_REACTOR_HTTP_NIO("reactor-http-nio"),
PROMETHEUS_BOUNDED_ELASTIC("boundedElastic-evictor"),
// -------------------------- Other --------------------------
@@ -173,29 +169,28 @@ public enum ThreadName {
QUERY_WORKER,
QUERY_SENTINEL,
TIMED_QUERY_SQL_COUNT,
- MPP_DATA_EXCHANGE_TASK_EXECUTOR,
FRAGMENT_INSTANCE_MANAGEMENT,
FRAGMENT_INSTANCE_NOTIFICATION,
- DATANODE_INTERNAL_RPC_SERVICE,
- DATANODE_INTERNAL_RPC_PROCESSOR,
DRIVER_TASK_SCHEDULER_NOTIFICATION));
private static Set<ThreadName> mppThreadNames =
new HashSet<>(
Arrays.asList(
MPP_COORDINATOR_SCHEDULED_EXECUTOR,
+ MPP_DATA_EXCHANGE_TASK_EXECUTOR,
ASYNC_DATANODE_CLIENT_POOL,
- MPP_COORDINATOR_WRITE_EXECUTOR,
MPP_DATA_EXCHANGE_RPC_SERVICE,
MPP_DATA_EXCHANGE_RPC_PROCESSOR,
MPP_COORDINATOR_EXECUTOR_POOL,
+ DATANODE_INTERNAL_RPC_SERVICE,
+ DATANODE_INTERNAL_RPC_PROCESSOR,
+ MPP_COORDINATOR_WRITE_EXECUTOR,
ASYNC_DATANODE_MPP_DATA_EXCHANGE_CLIENT_POOL));
private static Set<ThreadName> compactionThreadNames =
new HashSet<>(Arrays.asList(COMPACTION_WORKER, COMPACTION_SUB_TASK,
COMPACTION_SCHEDULE));
private static Set<ThreadName> walThreadNames =
new HashSet<>(
- Arrays.asList(
- WAL_DELETE, WAL_SERIALIZE, WAL_SYNC, WAL_DELETE, WAL_RECOVER,
TSFILE_RECOVER));
+ Arrays.asList(WAL_SERIALIZE, WAL_SYNC, WAL_DELETE, WAL_RECOVER,
TSFILE_RECOVER));
private static Set<ThreadName> flushThreadNames =
new HashSet<>(
@@ -205,15 +200,15 @@ public enum ThreadName {
FLUSH_TASK_SUBMIT,
TIMED_FLUSH_SEQ_MEMTABLE,
TIMED_FLUSH_UNSEQ_MEMTABLE));
-
private static Set<ThreadName> schemaEngineThreadNames =
new HashSet<>(
Arrays.asList(
- SCHEMA_REGION_FLUSH_PROCESSOR,
- SCHEMA_RELEASE_MONITOR,
SCHEMA_REGION_RELEASE_PROCESSOR,
+ SCHEMA_REGION_RECOVER_TASK,
+ SCHEMA_RELEASE_MONITOR,
+ SCHEMA_REGION_FLUSH_PROCESSOR,
SCHEMA_FLUSH_MONITOR,
- SCHEMA_REGION_RECOVER_TASK));
+ SCHEMA_FORCE_MLOG));
private static Set<ThreadName> clientServiceThreadNames =
new HashSet<>(Arrays.asList(CLIENT_RPC_SERVICE, CLIENT_RPC_PROCESSOR));
@@ -232,6 +227,7 @@ public enum ThreadName {
RAFT_SERVER_PROXY_EXECUTOR,
RAFT_SERVER_EXECUTOR,
RAFT_SERVER_CLIENT_EXECUTOR,
+ RATIS_ADD,
SEGMENT_RAFT_WORKER,
STATE_MACHINE_UPDATER,
FOLLOWER_STATE,
@@ -254,7 +250,8 @@ public enum ThreadName {
PIPE_RUNTIME_META_SYNCER,
PIPE_RUNTIME_PROCEDURE_SUBMITTER,
PIPE_WAL_RESOURCE_TTL_CHECKER,
- WINDOW_EVALUATION_SERVICE));
+ WINDOW_EVALUATION_SERVICE,
+ STATEFUL_TRIGGER_INFORMATION_UPDATER));
private static Set<ThreadName> jvmThreadNames =
new HashSet<>(
@@ -274,12 +271,39 @@ public enum ThreadName {
SIGNAL_DISPATCHER,
DESTROY_JVM,
COMMON_CLEANER));
+ private static Set<ThreadName> configNodeRpcThreadNames =
+ new HashSet<>(
+ Arrays.asList(
+ CONFIGNODE_RPC_SERVICE, CONFIGNODE_RPC_PROCESSOR,
ASYNC_CONFIGNODE_CLIENT_POOL));
+
+ private static Set<ThreadName> configNodeQueryThreadNames =
+ new HashSet<>(Arrays.asList(CQ_SCHEDULER));
+
+ private static Set<ThreadName> configNodeWriteThreadNames =
+ new HashSet<>(Arrays.asList(CONFIG_NODE_SAMPLE_CONSENSUS_WAL_FLUSH));
+
+ private static Set<ThreadName> configNodeHeartbeatThreadNames =
+ new HashSet<>(
+ Arrays.asList(
+ CONFIG_NODE_HEART_BEAT_SERVICE,
+ ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL,
+ ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL));
+
+ private static Set<ThreadName> configNodeLoadBalanceThreadNames =
+ new HashSet<>(Arrays.asList(CONFIG_NODE_LOAD_STATISTIC));
+
+ private static Set<ThreadName> configNodeRegionManagementThreadNames =
+ new HashSet<>(Arrays.asList(CONFIG_NODE_REGION_MAINTAINER));
+
+ private static Set<ThreadName> configNodeRecoverThreadNames =
+ new HashSet<>(Arrays.asList(CONFIG_NODE_RECOVER));
private static Set<ThreadName> metricsThreadNames =
new HashSet<>(
Arrays.asList(
SYSTEM_SCHEDULE_METRICS,
RESOURCE_CONTROL_DISK_STATISTIC,
+ PROMETHEUS_REACTOR_HTTP_EPOLL,
PROMETHEUS_REACTOR_HTTP_NIO,
PROMETHEUS_BOUNDED_ELASTIC));
private static Set<ThreadName> otherThreadNames =
@@ -290,7 +314,11 @@ public enum ThreadName {
INFLUXDB_RPC_SERVICE,
INFLUXDB_RPC_PROCESSOR,
STORAGE_ENGINE_CACHED_POOL,
- MLNODE_RPC_SERVICE));
+ MLNODE_RPC_SERVICE,
+ IOTDB_SHUTDOWN_HOOK,
+ UPGRADE_TASK,
+ REGION_MIGRATE,
+ STORAGE_ENGINE_RECOVER_TRIGGER));
private static Set<ThreadName>[] threadNameSetList =
new Set[] {
@@ -306,25 +334,39 @@ public enum ThreadName {
computeThreadNames,
jvmThreadNames,
metricsThreadNames,
+ configNodeRpcThreadNames,
+ configNodeQueryThreadNames,
+ configNodeWriteThreadNames,
+ configNodeHeartbeatThreadNames,
+ configNodeLoadBalanceThreadNames,
+ configNodeRegionManagementThreadNames,
+ configNodeRecoverThreadNames,
otherThreadNames
};
- private static DataNodeThreadModule[] modules =
- new DataNodeThreadModule[] {
- DataNodeThreadModule.QUERY,
- DataNodeThreadModule.MPP,
- DataNodeThreadModule.COMPACTION,
- DataNodeThreadModule.WAL,
- DataNodeThreadModule.FLUSH,
- DataNodeThreadModule.SCHEMA_ENGINE,
- DataNodeThreadModule.CLIENT_SERVICE,
- DataNodeThreadModule.IOT_CONSENSUS,
- DataNodeThreadModule.RATIS_CONSENSUS,
- DataNodeThreadModule.COMPUTE,
- DataNodeThreadModule.SYNC,
- DataNodeThreadModule.JVM,
- DataNodeThreadModule.METRICS,
- DataNodeThreadModule.OTHER
+ private static ThreadModule[] modules =
+ new ThreadModule[] {
+ ThreadModule.QUERY,
+ ThreadModule.MPP,
+ ThreadModule.COMPACTION,
+ ThreadModule.WAL,
+ ThreadModule.FLUSH,
+ ThreadModule.SCHEMA_ENGINE,
+ ThreadModule.CLIENT_SERVICE,
+ ThreadModule.IOT_CONSENSUS,
+ ThreadModule.RATIS_CONSENSUS,
+ ThreadModule.COMPUTE,
+ ThreadModule.SYNC,
+ ThreadModule.JVM,
+ ThreadModule.METRICS,
+ ThreadModule.RPC,
+ ThreadModule.QUERY,
+ ThreadModule.WRITE,
+ ThreadModule.HEARTBEAT,
+ ThreadModule.LOAD_BALANCE,
+ ThreadModule.REGION_MANAGEMENT,
+ ThreadModule.RECOVER,
+ ThreadModule.OTHER
};
ThreadName(String name) {
@@ -335,53 +377,21 @@ public enum ThreadName {
return name;
}
- public static DataNodeThreadModule getDataNodeModuleTheThreadBelongs(String
givenThreadName) {
- Set<ThreadName>[] threadNameSetList =
- new Set[] {
- queryThreadNames,
- mppThreadNames,
- compactionThreadNames,
- walThreadNames,
- flushThreadNames,
- schemaEngineThreadNames,
- clientServiceThreadNames,
- iotConsensusThrreadNames,
- ratisThreadNames,
- computeThreadNames,
- jvmThreadNames,
- metricsThreadNames,
- otherThreadNames
- };
- DataNodeThreadModule[] modules =
- new DataNodeThreadModule[] {
- DataNodeThreadModule.QUERY,
- DataNodeThreadModule.MPP,
- DataNodeThreadModule.COMPACTION,
- DataNodeThreadModule.WAL,
- DataNodeThreadModule.FLUSH,
- DataNodeThreadModule.SCHEMA_ENGINE,
- DataNodeThreadModule.CLIENT_SERVICE,
- DataNodeThreadModule.IOT_CONSENSUS,
- DataNodeThreadModule.RATIS_CONSENSUS,
- DataNodeThreadModule.COMPUTE,
- DataNodeThreadModule.JVM,
- DataNodeThreadModule.METRICS,
- DataNodeThreadModule.OTHER
- };
+ public static ThreadModule getModuleTheThreadBelongs(String givenThreadName)
{
for (int i = 0, length = modules.length; i < length; ++i) {
if (matchModuleWithThreadNames(threadNameSetList[i], modules[i],
givenThreadName) != null) {
return modules[i];
}
}
if (givenThreadName.contains(LOG_BACK.getName())) {
- return DataNodeThreadModule.LOG_BACK;
+ return ThreadModule.LOG_BACK;
}
- return DataNodeThreadModule.UNKNOWN;
+ return ThreadModule.UNKNOWN;
}
- private static DataNodeThreadModule matchModuleWithThreadNames(
- Set<ThreadName> threadNames, DataNodeThreadModule module, String
givenThreadName) {
+ private static ThreadModule matchModuleWithThreadNames(
+ Set<ThreadName> threadNames, ThreadModule module, String
givenThreadName) {
for (ThreadName threadName : threadNames) {
if (threadName.getName().contains("\\d")) {
if
(Pattern.compile(threadName.getName()).matcher(givenThreadName).find()) {
diff --git
a/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java
b/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java
index e49c900f01e..9398120f4d2 100644
---
a/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java
+++
b/server/src/main/java/org/apache/iotdb/db/service/metrics/DataNodeMetricsHelper.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.service.metrics;
-import org.apache.iotdb.commons.concurrent.DataNodeThreadModule;
+import org.apache.iotdb.commons.concurrent.ThreadModule;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.concurrent.ThreadPoolMetrics;
import org.apache.iotdb.commons.conf.IoTDBConstant;
@@ -75,9 +75,8 @@ public class DataNodeMetricsHelper {
}
private static void initCpuMetrics() {
-
List<String> threadModules = new ArrayList<>();
- Arrays.stream(DataNodeThreadModule.values()).forEach(x ->
threadModules.add(x.toString()));
+ Arrays.stream(ThreadModule.values()).forEach(x ->
threadModules.add(x.toString()));
List<String> pools = new ArrayList<>();
Arrays.stream(ThreadName.values()).forEach(x -> pools.add(x.name()));
MetricService.getInstance()
@@ -85,7 +84,7 @@ public class DataNodeMetricsHelper {
new CpuUsageMetrics(
threadModules,
pools,
- x ->
ThreadName.getDataNodeModuleTheThreadBelongs(x).toString(),
+ x -> ThreadName.getModuleTheThreadBelongs(x).toString(),
x -> ThreadName.getThreadPoolTheThreadBelongs(x).name()));
}
}
