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
commit ea5cc7ca4f1f2c97ce32307b8e8e96fe3e3a0a45 Author: Liu Xuxin <[email protected]> AuthorDate: Mon Jun 19 22:48:29 2023 +0800 temp --- .../statemachine/ConfigRegionStateMachine.java | 3 +- .../confignode/manager/RetryFailedTasksThread.java | 4 +- .../manager/load/service/HeartbeatService.java | 4 +- .../manager/load/service/StatisticsService.java | 4 +- .../manager/partition/PartitionManager.java | 4 +- .../iotdb/consensus/ratis/RatisConsensus.java | 6 +- .../iotdb/trigger/StatisticsUpdaterTrigger.java | 3 +- .../commons/concurrent/ConfigNodeThreadModule.java | 24 ++++++ .../iotdb/commons/concurrent/ThreadName.java | 96 +++++++++++++--------- .../db/metadata/schemaregion/SchemaEngine.java | 4 +- .../iotdb/db/service/RegionMigrateService.java | 4 +- .../org/apache/iotdb/db/service/UpgradeSevice.java | 5 +- .../db/service/metrics/DataNodeMetricsHelper.java | 2 +- .../iotdb/db/wal/recover/WALRecoverManager.java | 2 +- 14 files changed, 114 insertions(+), 51 deletions(-) diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java index 4964ba79774..72b454e2452 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigRegionStateMachine.java @@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.auth.AuthException; 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.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.ConsensusGroupId; @@ -64,7 +65,7 @@ public class ConfigRegionStateMachine private static final Logger LOGGER = LoggerFactory.getLogger(ConfigRegionStateMachine.class); private static final ExecutorService threadPool = - IoTDBThreadPoolFactory.newCachedThreadPool("ConfigNode-Manager-Recovery"); + IoTDBThreadPoolFactory.newCachedThreadPool(ThreadName.CONFIG_NODE_RECOVER.getName()); private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf(); private final ConfigPlanExecutor executor; private ConfigManager configManager; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java index 021ef308f5a..9d21fe0112b 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java @@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.NodeStatus; 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.confignode.conf.ConfigNodeConfig; import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor; @@ -56,7 +57,8 @@ public class RetryFailedTasksThread { private final NodeManager nodeManager; private final LoadManager loadManager; private final ScheduledExecutorService retryFailTasksExecutor = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("Cluster-RetryFailedTasks-Service"); + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( + ThreadName.CONFIG_NODE_HEART_BEAT_SERVICE.getName()); private final Object scheduleMonitor = new Object(); private Future<?> currentFailedTasksRetryThreadFuture; diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java index 3e91b2b4013..eaffaab8c6d 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/HeartbeatService.java @@ -22,6 +22,7 @@ package org.apache.iotdb.confignode.manager.load.service; import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation; import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration; 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.commons.pipe.config.PipeConfig; import org.apache.iotdb.confignode.client.async.AsyncConfigNodeHeartbeatClientPool; @@ -63,7 +64,8 @@ public class HeartbeatService { private Future<?> currentHeartbeatFuture; private final ScheduledExecutorService heartBeatExecutor = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("Cluster-Heartbeat-Service"); + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( + ThreadName.CONFIG_NODE_HEART_BEAT_SERVICE.getName()); private final AtomicLong heartbeatCounter = new AtomicLong(0); public HeartbeatService(IManager configManager, LoadCache loadCache) { diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/StatisticsService.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/StatisticsService.java index 94c6c724e6d..0b881782642 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/StatisticsService.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/service/StatisticsService.java @@ -25,6 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.cluster.NodeStatus; 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.confignode.client.DataNodeRequestType; import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool; @@ -80,7 +81,8 @@ public class StatisticsService implements IClusterStatusSubscriber { private Future<?> currentLoadStatisticsFuture; private final ScheduledExecutorService loadStatisticsExecutor = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("Cluster-LoadStatistics-Service"); + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( + ThreadName.CONFIG_NODE_LOAD_STATISTIC.getName()); /** Start the load statistics service. */ public void startLoadStatisticsService() { diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java index 386dc221ffd..cda438c8d95 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java @@ -27,6 +27,7 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.commons.cluster.RegionRoleType; 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.commons.conf.CommonConfig; import org.apache.iotdb.commons.conf.CommonDescriptor; @@ -139,7 +140,8 @@ public class PartitionManager { this.configManager = configManager; this.partitionInfo = partitionInfo; this.regionMaintainer = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("IoTDB-Region-Maintainer"); + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( + ThreadName.CONFIG_NODE_REGION_MAINTAINER.getName()); setSeriesPartitionExecutor(); } diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java index d8fb18e1aae..5e77d1607bd 100644 --- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java +++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java @@ -28,6 +28,7 @@ import org.apache.iotdb.commons.client.IClientPoolFactory; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.client.property.ClientPoolProperty; 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.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.service.metric.MetricService; @@ -144,9 +145,10 @@ class RatisConsensus implements IConsensus { this.ratisMetricSet = new RatisMetricSet(); this.triggerSnapshotThreshold = this.config.getImpl().getTriggerSnapshotFileSize(); - addExecutor = IoTDBThreadPoolFactory.newCachedThreadPool("ratis-add"); + addExecutor = IoTDBThreadPoolFactory.newCachedThreadPool(ThreadName.RATIS_ADD.getName()); diskGuardian = - IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("ratis-bg-disk-guardian"); + IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( + ThreadName.RATIS_BG_DISK_GUARDIAN.getName()); clientManager = new IClientManager.Factory<RaftGroup, RatisClient>() 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 d633f15ad14..4e96c588f6d 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,6 +20,7 @@ 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; @@ -60,7 +61,7 @@ public class StatisticsUpdaterTrigger implements Trigger { private final ScheduledExecutorService triggerInformationUpdateExecutor = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( - "Stateful-Trigger-Statistics-Updater"); + ThreadName.TRIGGER_STATISTIC_UPDATER.getName()); private static final long UPDATE_INTERVAL = 1000 * 20; diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ConfigNodeThreadModule.java b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ConfigNodeThreadModule.java new file mode 100644 index 00000000000..6cca9c12642 --- /dev/null +++ b/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/ConfigNodeThreadModule.java @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.commons.concurrent; + +public enum ConfigNodeThreadModule { + CONFIGNODE_RPC_PROCESSOR, +} 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 7170d4a4e4c..1af689f5f63 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 @@ -52,6 +52,7 @@ public enum ThreadName { WAL_SYNC("WAL-Sync"), WAL_DELETE("WAL-Delete"), WAL_RECOVER("WAL-Recover"), + TSFILE_RECOVER("TsFile-Recover"), // -------------------------- Write -------------------------- MPP_COORDINATOR_WRITE_EXECUTOR("MPP-Coordinator-Write-Executor"), // -------------------------- Flush -------------------------- @@ -62,6 +63,7 @@ public enum ThreadName { TIMED_FLUSH_UNSEQ_MEMTABLE("Timed-Flush-Unseq-Memtable"), // -------------------------- SchemaEngine -------------------------- SCHEMA_REGION_RELEASE_PROCESSOR("SchemaRegion-Release-Task-Processor"), + SCHEMA_REGION_RECOVER_TASK("SchemaRegion-recover-task"), SCHEMA_RELEASE_MONITOR("Schema-Release-Task-Monitor"), SCHEMA_REGION_FLUSH_PROCESSOR("SchemaRegion-Flush-Task-Processor"), SCHEMA_FLUSH_MONITOR("Schema-Flush-Task-Monitor"), @@ -76,6 +78,17 @@ public enum ThreadName { ASYNC_CONFIGNODE_CLIENT_POOL("AsyncConfigNodeIServiceClientPool"), // -------------------------- ConfigNode-Query -------------------------- CQ_MANAGER("CQ-Scheduler"), + TRIGGER_STATISTIC_UPDATER("Stateful-Trigger-Statistics-Updater"), + CONFIG_NODE_RETRY_FAILED_TASK("Cluster-RetryFailedTasks-Service"), + // -------------------------- ConfigNode-Heartbeat -------------------------- + CONFIG_NODE_HEART_BEAT_SERVICE("Cluster-Heartbeat-Service"), + // -------------------------- ConfigNode-Compute -------------------------- + CONFIG_NODE_LOAD_STATISTIC("Cluster-LoadStatistics-Service"), + // -------------------------- ConfigNode-RegionManagement -------------------------- + CONFIG_NODE_REGION_MAINTAINER("IoTDB-Region-Maintainer"), + // -------------------------- ConfigNode-Recover -------------------------- + CONFIG_NODE_RECOVER("ConfigNode-Manager-Recovery"), + // -------------------------- IoTConsensus -------------------------- IOT_CONSENSUS_RPC_SERVICE("IoTConsensusRPC-Service"), IOT_CONSENSUS_RPC_PROCESSOR("IoTConsensusRPC-Processor"), @@ -87,6 +100,7 @@ public enum ThreadName { RAFT_SERVER_PROXY_EXECUTOR("\\d+-impl-thread"), RAFT_SERVER_EXECUTOR("\\d+-server-thread"), RAFT_SERVER_CLIENT_EXECUTOR("\\d+-client-thread"), + RATIS_ADD("Ratis-Add"), SEGMENT_RAFT_WORKER("SegmentedRaftLogWorker"), STATE_MACHINE_UPDATER("StateMachineUpdater"), FOLLOWER_STATE("FollowerState"), @@ -94,7 +108,7 @@ public enum ThreadName { LEADER_ELECTION("LeaderElection"), LOG_APPENDER("GrpcLogAppender"), EVENT_PROCESSOR("EventProcessor"), - RATIS_BG_DISK_GUARDIAN("ratis-bg-disk-guardian"), + RATIS_BG_DISK_GUARDIAN("RatisBgDiskGuardian"), GRPC_DEFAULT_BOSS_ELG("grpc-default-boss-ELG"), GRPC_DEFAULT_EXECUTOR("grpc-default-executor"), GPRC_DEFAULT_WORKER_ELG("grpc-default-worker-ELG"), @@ -141,6 +155,8 @@ public enum ThreadName { STORAGE_ENGINE_CACHED_POOL("StorageEngine"), MLNODE_RPC_SERVICE("MLNodeRpc-Service"), IOTDB_SHUTDOWN_HOOK("IoTDB-Shutdown-Hook"), + UPGRADE_TASK("UpgradeThread"), + REGION_MIGRATE("Region-Migrate-Pool"), STORAGE_ENGINE_RECOVER_TRIGGER("StorageEngine-RecoverTrigger"), // the unknown thread name is used for metrics UNKOWN("UNKNOWN"); @@ -172,7 +188,9 @@ public enum ThreadName { 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)); + new HashSet<>( + Arrays.asList( + WAL_DELETE, WAL_SERIALIZE, WAL_SYNC, WAL_DELETE, WAL_RECOVER, TSFILE_RECOVER)); private static Set<ThreadName> flushThreadNames = new HashSet<>( @@ -189,7 +207,8 @@ public enum ThreadName { SCHEMA_REGION_FLUSH_PROCESSOR, SCHEMA_RELEASE_MONITOR, SCHEMA_REGION_RELEASE_PROCESSOR, - SCHEMA_FLUSH_MONITOR)); + SCHEMA_FLUSH_MONITOR, + SCHEMA_REGION_RECOVER_TASK)); private static Set<ThreadName> clientServiceThreadNames = new HashSet<>(Arrays.asList(CLIENT_RPC_SERVICE, CLIENT_RPC_PROCESSOR)); @@ -268,6 +287,41 @@ public enum ThreadName { STORAGE_ENGINE_CACHED_POOL, MLNODE_RPC_SERVICE)); + private static Set<ThreadName>[] threadNameSetList = + new Set[] { + queryThreadNames, + mppThreadNames, + compactionThreadNames, + walThreadNames, + flushThreadNames, + schemaEngineThreadNames, + clientServiceThreadNames, + iotConsensusThrreadNames, + ratisThreadNames, + computeThreadNames, + jvmThreadNames, + metricsThreadNames, + 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 + }; + ThreadName(String name) { this.name = name; } @@ -276,41 +330,7 @@ public enum ThreadName { return name; } - public static DataNodeThreadModule getModuleTheThreadBelongs(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.SYNC, - DataNodeThreadModule.JVM, - DataNodeThreadModule.METRICS, - DataNodeThreadModule.OTHER - }; - + public static DataNodeThreadModule getDataNodeModuleTheThreadBelongs(String givenThreadName) { for (int i = 0, length = modules.length; i < length; ++i) { if (matchModuleWithThreadNames(threadNameSetList[i], modules[i], givenThreadName) != null) { return modules[i]; diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java index a28ddb2dc93..f50dfc73b29 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java @@ -20,6 +20,7 @@ package org.apache.iotdb.db.metadata.schemaregion; 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.commons.conf.CommonDescriptor; import org.apache.iotdb.commons.consensus.SchemaRegionId; @@ -140,7 +141,8 @@ public class SchemaEngine { // recover SchemaRegion concurrently ExecutorService schemaRegionRecoverPools = IoTDBThreadPoolFactory.newFixedThreadPool( - Runtime.getRuntime().availableProcessors(), "SchemaRegion-recover-task"); + Runtime.getRuntime().availableProcessors(), + ThreadName.SCHEMA_REGION_RECOVER_TASK.getName()); List<Future<ISchemaRegion>> futures = new ArrayList<>(); for (File file : sgDirList) { diff --git a/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java b/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java index 547fb78ee03..382c62b230d 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/RegionMigrateService.java @@ -25,6 +25,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionMigrateFailedType; import org.apache.iotdb.common.rpc.thrift.TSStatus; import org.apache.iotdb.commons.client.exception.ClientManagerException; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.consensus.ConsensusGroupId; import org.apache.iotdb.commons.consensus.DataRegionId; import org.apache.iotdb.commons.consensus.SchemaRegionId; @@ -161,7 +162,8 @@ public class RegionMigrateService implements IService { private final Logger poolLogger = LoggerFactory.getLogger(RegionMigratePool.class); private RegionMigratePool() { - this.pool = IoTDBThreadPoolFactory.newSingleThreadExecutor("Region-Migrate-Pool"); + this.pool = + IoTDBThreadPoolFactory.newSingleThreadExecutor(ThreadName.REGION_MIGRATE.getName()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java index 4838baba346..08a12911b1f 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java +++ b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.service; import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory; +import org.apache.iotdb.commons.concurrent.ThreadName; import org.apache.iotdb.commons.service.IService; import org.apache.iotdb.commons.service.ServiceType; import org.apache.iotdb.db.conf.IoTDBDescriptor; @@ -57,7 +58,9 @@ public class UpgradeSevice implements IService { if (updateThreadNum <= 0) { updateThreadNum = 1; } - upgradeThreadPool = IoTDBThreadPoolFactory.newFixedThreadPool(updateThreadNum, "UpgradeThread"); + upgradeThreadPool = + IoTDBThreadPoolFactory.newFixedThreadPool( + updateThreadNum, ThreadName.UPGRADE_TASK.getName()); UpgradeLog.createUpgradeLog(); countUpgradeFiles(); if (cntUpgradeFileNum.get() == 0) { 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 fce52272b3e..e49c900f01e 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 @@ -85,7 +85,7 @@ public class DataNodeMetricsHelper { new CpuUsageMetrics( threadModules, pools, - x -> ThreadName.getModuleTheThreadBelongs(x).toString(), + x -> ThreadName.getDataNodeModuleTheThreadBelongs(x).toString(), x -> ThreadName.getThreadPoolTheThreadBelongs(x).name())); } } diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java index 3f545487d67..8c5aa31bf79 100644 --- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java +++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java @@ -137,7 +137,7 @@ public class WALRecoverManager { List<Future<Void>> futures = new ArrayList<>(); ExecutorService recoverTsFilesThreadPool = IoTDBThreadPoolFactory.newFixedThreadPool( - Runtime.getRuntime().availableProcessors(), "TsFile-Recover"); + Runtime.getRuntime().availableProcessors(), ThreadName.TSFILE_RECOVER.getName()); // async recover for (UnsealedTsFileRecoverPerformer recoverPerformer : absolutePath2RecoverPerformer.values()) { Callable<Void> recoverTsFileTask =
