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 a2889baecc6281ca364c1aa3ca34cf982820abc8 Author: Liu Xuxin <[email protected]> AuthorDate: Wed Jun 21 15:33:06 2023 +0800 temp --- .../confignode/consensus/statemachine/ConfigRegionStateMachine.java | 2 +- .../main/java/org/apache/iotdb/confignode/manager/cq/CQManager.java | 3 ++- .../main/java/org/apache/iotdb/commons/concurrent/ThreadName.java | 5 +++++ .../java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java | 2 +- .../apache/iotdb/db/trigger/service/TriggerInformationUpdater.java | 3 ++- 5 files changed, 11 insertions(+), 4 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 72b454e2452..961f802f94e 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 @@ -344,7 +344,7 @@ public class ConfigRegionStateMachine ScheduledExecutorService simpleConsensusThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( - "ConfigNode-Simple-Consensus-WAL-Flush-Thread"); + ThreadName.CONFIG_NODE_SAMPLE_CONSENSUS_WAL_FLUSH.getName()); ScheduledExecutorUtil.safelyScheduleWithFixedDelay( simpleConsensusThread, this::flushWALForSimpleConsensus, 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 2559b239ea0..c0daea8687e 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 @@ -131,7 +131,8 @@ public class CQManager { // 2. start a new schedule thread pool executor = - IoTDBThreadPoolFactory.newScheduledThreadPool(CONF.getCqSubmitThread(), "CQ-Scheduler"); + IoTDBThreadPoolFactory.newScheduledThreadPool( + CONF.getCqSubmitThread(), ThreadName.CQ_SCHEDULER.getName()); // 3. get all CQs List<CQInfo.CQEntry> allCQs = null; 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 1af689f5f63..8a9ef4a82b6 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 @@ -67,6 +67,7 @@ public enum ThreadName { SCHEMA_RELEASE_MONITOR("Schema-Release-Task-Monitor"), SCHEMA_REGION_FLUSH_PROCESSOR("SchemaRegion-Flush-Task-Processor"), SCHEMA_FLUSH_MONITOR("Schema-Flush-Task-Monitor"), + SCHEMA_FORCE_MLOG("SchemaEngine-TimedForceMLog-Thread"), // -------------------------- ClientService -------------------------- CLIENT_RPC_SERVICE("ClientRPC-Service"), CLIENT_RPC_PROCESSOR("ClientRPC-Processor"), @@ -78,8 +79,11 @@ public enum ThreadName { 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 -------------------------- @@ -122,6 +126,7 @@ public enum ThreadName { PIPE_RUNTIME_PROCEDURE_SUBMITTER("Pipe-Runtime-Procedure-Submitter"), PIPE_WAL_RESOURCE_TTL_CHECKER("Pipe-WAL-Resource-TTL-Checker"), WINDOW_EVALUATION_SERVICE("WindowEvaluationTaskPoolManager"), + STATEFUL_TRIGGER_INFORMATION_UPDATER("Stateful-Trigger-Information-Updater"), // -------------------------- JVM -------------------------- // NOTICE: The thread name of jvm cannot be edited here! // We list the thread name here just for distinguishing what module the thread belongs to. 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 f50dfc73b29..9fd0b7adff3 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 @@ -116,7 +116,7 @@ public class SchemaEngine { && config.getSyncMlogPeriodInMs() != 0) { timedForceMLogThread = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( - "SchemaEngine-TimedForceMLog-Thread"); + ThreadName.SCHEMA_FORCE_MLOG.getName()); ScheduledExecutorUtil.unsafelyScheduleAtFixedRate( timedForceMLogThread, this::forceMlog, diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java index 39cdeb3ae1e..5b0694c8548 100644 --- a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java +++ b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerInformationUpdater.java @@ -21,6 +21,7 @@ package org.apache.iotdb.db.trigger.service; import org.apache.iotdb.commons.client.IClientManager; 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.ConfigRegionId; import org.apache.iotdb.commons.exception.IoTDBException; @@ -49,7 +50,7 @@ public class TriggerInformationUpdater { private final ScheduledExecutorService triggerInformationUpdateExecutor = IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor( - "Stateful-Trigger-Information-Updater"); + ThreadName.STATEFUL_TRIGGER_INFORMATION_UPDATER.getName()); private Future<?> updateFuture;
