This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch update_thrift_thread_name in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b321d5c803c7a03384ab0ccf209d304230964cf2 Author: qiaojialin <[email protected]> AuthorDate: Tue Sep 6 11:49:11 2022 +0800 rename ThreadName --- .../service/thrift/ConfigNodeRPCService.java | 6 +-- .../multileader/service/MultiLeaderRPCService.java | 4 +- .../iotdb/commons/client/ClientPoolFactory.java | 6 +-- .../iotdb/commons/concurrent/ThreadName.java | 62 ++++++---------------- .../client/mock/MockInternalRPCService.java | 4 +- .../iotdb/db/client/DataNodeClientPoolFactory.java | 4 +- .../execution/exchange/MPPDataExchangeService.java | 6 +-- .../db/service/DataNodeInternalRPCService.java | 6 +-- .../iotdb/db/service/InfluxDBRPCService.java | 4 +- .../org/apache/iotdb/db/service/RPCService.java | 8 +-- 10 files changed, 41 insertions(+), 69 deletions(-) diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java index 740774944f..134a528229 100644 --- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java +++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java @@ -72,7 +72,7 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC new ThriftServiceThread( processor, getID().getName(), - ThreadName.CONFIG_NODE_RPC_CLIENT.getName(), + ThreadName.CONFIGNODE_RPC_PROCESSOR.getName(), getBindIP(), getBindPort(), configConf.getRpcMaxConcurrentClientNum(), @@ -82,7 +82,7 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.CONFIG_NODE_RPC_SERVER.getName()); + thriftServiceThread.setName(ThreadName.CONFIGNODE_RPC_SERVICE.getName()); MetricService.getInstance() .getOrCreateAutoGauge( Metric.THRIFT_ACTIVE_THREADS.toString(), @@ -90,7 +90,7 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC thriftServiceThread, AbstractThriftServiceThread::getActiveThreadCount, Tag.NAME.toString(), - ThreadName.CONFIG_NODE_RPC_SERVER.getName()); + ThreadName.CONFIGNODE_RPC_SERVICE.getName()); } @Override diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCService.java b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCService.java index c94892a8b5..d7b41f7818 100644 --- a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCService.java +++ b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/service/MultiLeaderRPCService.java @@ -74,7 +74,7 @@ public class MultiLeaderRPCService extends ThriftService implements MultiLeaderR new ThriftServiceThread( (TBaseAsyncProcessor) processor, getID().getName(), - ThreadName.MULTI_LEADER_CONSENSUS_RPC_CLIENT.getName(), + ThreadName.MULTI_LEADER_CONSENSUS_RPC_PROCESSOR.getName(), getBindIP(), getBindPort(), config.getRpc().getRpcSelectorThreadNum(), @@ -89,7 +89,7 @@ public class MultiLeaderRPCService extends ThriftService implements MultiLeaderR } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.MULTI_LEADER_CONSENSUS_RPC_SERVER.getName()); + thriftServiceThread.setName(ThreadName.MULTI_LEADER_CONSENSUS_RPC_SERVICE.getName()); } @Override diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java index 0361f4598d..a95da8ac27 100644 --- a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java +++ b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java @@ -67,7 +67,7 @@ public class ClientPoolFactory { .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) .build(), - ThreadName.DATA_NODE_CLIENT_POOL_THREAD_NAME.getName()), + ThreadName.ASYNC_DATANODE_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncDataNodeInternalServiceClient>().build().getConfig()); } } @@ -85,7 +85,7 @@ public class ClientPoolFactory { .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) .build(), - ThreadName.CONFIG_NODE_HEARTBEAT_CLIENT_POOL_THREAD_NAME.getName()), + ThreadName.ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncConfigNodeHeartbeatServiceClient>() .build() .getConfig()); @@ -105,7 +105,7 @@ public class ClientPoolFactory { .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnabled()) .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) .build(), - ThreadName.DATA_NODE_HEARTBEAT_CLIENT_POOL_THREAD_NAME.getName()), + ThreadName.ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncDataNodeHeartbeatServiceClient>() .build() .getConfig()); 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 971f04ab2f..c459026409 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 @@ -19,21 +19,18 @@ package org.apache.iotdb.commons.concurrent; public enum ThreadName { - METRICS_SERVICE("Metrics-ServerServiceImpl"), - RPC_SERVICE("RPC"), - RPC_CLIENT("RPC-Client"), - INFLUXDB_SERVICE("Influxdb-Service"), - INFLUXDB_CLIENT("Influxdb-Client"), - MERGE_SERVICE("Merge"), - CLOSE_MERGE_SERVICE("Close-Merge"), - CLOSE_MERGE_DAEMON("Close-Merge-Daemon"), - CLOSE_DAEMON("Close-Daemon"), - MERGE_DAEMON("Merge-Daemon"), - MEMORY_MONITOR("MemMonitor"), - MEMORY_STATISTICS("MemStatistic"), - FLUSH_PARTIAL_POLICY("FlushPartialPolicy"), - FORCE_FLUSH_ALL_POLICY("ForceFlushAllPolicy"), - STAT_MONITOR("StatMonitor"), + CLIENT_RPC_SERVICE("ClientRPC-Service"), + CLIENT_RPC_PROCESSOR("ClientRPC-Processor"), + CONFIGNODE_RPC_SERVICE("ConfigNodeRpc-Service"), + CONFIGNODE_RPC_PROCESSOR("ConfigNodeRPC-Processor"), + MULTI_LEADER_CONSENSUS_RPC_SERVICE("MultiLeaderConsensusRPC-Service"), + MULTI_LEADER_CONSENSUS_RPC_PROCESSOR("MultiLeaderConsensusRPC-Processor"), + MPP_DATA_EXCHANGE_RPC_SERVICE("MPPDataExchangeRPC-Service"), + MPP_DATA_EXCHANGE_RPC_PROCESSOR("MPPDataExchangeRPC-Processor"), + DATANODE_INTERNAL_RPC_SERVICE("DataNodeInternalRPC-Service"), + DATANODE_INTERNAL_RPC_PROCESSOR("DataNodeInternalRPC-Processor"), + INFLUXDB_RPC_SERVICE("InfluxdbRPC-Service"), + INFLUXDB_RPC_PROCESSOR("InfluxdbRPC-Processor"), DATA_REGION_RECOVER_SERVICE("Data-Region-Recover"), FLUSH_SERVICE("Flush"), FLUSH_SUB_TASK_SERVICE("Flush-SubTask"), @@ -44,10 +41,8 @@ public enum ThreadName { WAL_SYNC("WAL-Sync"), WAL_DELETE("WAL-Delete"), WAL_RECOVER("WAL-Recover"), - INDEX_SERVICE("Index"), SYNC_CLIENT("Sync-Client"), SYNC_SERVER("Sync"), - TIME_COST_STATISTIC("TIME_COST_STATISTIC"), QUERY_SERVICE("Query"), SUB_RAW_QUERY_SERVICE("Sub_RawQuery"), INSERTION_SERVICE("MultithreadingInsertionPool"), @@ -60,35 +55,12 @@ public enum ThreadName { SYNC_SENDER_HEARTBEAT("Sync-Heartbeat"), SYNC_RECEIVER_COLLECTOR("Sync-Collector"), CONTINUOUS_QUERY_SERVICE("ContinuousQueryTaskPoolManager"), - CLUSTER_INFO_SERVICE("ClusterInfoClient"), - CLUSTER_RPC_SERVICE("ClusterRPC"), - CLUSTER_RPC_CLIENT("Cluster-RPC-Client"), - CLUSTER_META_RPC_SERVICE("ClusterMetaRPC"), - CLUSTER_META_RPC_CLIENT("ClusterMetaRPC-Client"), - CLUSTER_META_HEARTBEAT_RPC_SERVICE("ClusterMetaHeartbeatRPC"), - CLUSTER_META_HEARTBEAT_RPC_CLIENT("ClusterMetaHeartbeatRPC-Client"), - CLUSTER_DATA_RPC_SERVICE("ClusterDataRPC"), - CLUSTER_DATA_RPC_CLIENT("ClusterDataRPC-Client"), - CLUSTER_DATA_HEARTBEAT_RPC_SERVICE("ClusterDataHeartbeatRPC"), - CLUSTER_DATA_HEARTBEAT_RPC_CLIENT("ClusterDataHeartbeatRPC-Client"), - CLUSTER_MONITOR("ClusterMonitor"), - CONFIG_NODE_RPC_SERVER("ConfigNodeRpcServer"), - CONFIG_NODE_RPC_CLIENT("ConfigNodeRPC-Client"), - MULTI_LEADER_CONSENSUS_RPC_CLIENT("MultiLeaderConsensusRPC-Client"), - MULTI_LEADER_CONSENSUS_RPC_SERVER("MultiLeaderConsensusRPC-Server"), - DATA_NODE_MANAGEMENT_RPC_SERVER("DataNodeManagementRPC"), - DATA_NODE_MANAGEMENT_RPC_CLIENT("DataNodeManagementRPC-Client"), - MPP_DATA_EXCHANGE_RPC_SERVER("MPPDataExchangeRPC"), - MPP_DATA_EXCHANGE_RPC_CLIENT("MPPDataExchangeRPC-Client"), - INTERNAL_SERVICE_RPC_SERVER("InternalServiceRPC"), - INTERNAL_SERVICE_RPC_CLIENT("InternalServiceRPC-Client"), EXT_PIPE_PLUGIN_WORKER("ExtPipePlugin-Worker"), - DATA_NODE_CLIENT_POOL_THREAD_NAME("AsyncDataNodeInternalServiceClientPool"), - CONFIG_NODE_HEARTBEAT_CLIENT_POOL_THREAD_NAME("AsyncConfigNodeHeartbeatServiceClientPool"), - DATA_NODE_HEARTBEAT_CLIENT_POOL_THREAD_NAME("AsyncDataNodeHeartbeatServiceClientPool"), - CONFIG_NODE_CLIENT_POOL_THREAD_NAME("AsyncConfigNodeIServiceClientPool"), - DATA_NODE_MPP_DATA_EXCHANGE_CLIENT_POOL_THREAD_NAME( - "AsyncDataNodeMPPDataExchangeServiceClientPool"); + ASYNC_DATANODE_CLIENT_POOL("AsyncDataNodeInternalServiceClientPool"), + ASYNC_CONFIGNODE_HEARTBEAT_CLIENT_POOL("AsyncConfigNodeHeartbeatServiceClientPool"), + ASYNC_DATANODE_HEARTBEAT_CLIENT_POOL("AsyncDataNodeHeartbeatServiceClientPool"), + ASYNC_CONFIGNODE_CLIENT_POOL("AsyncConfigNodeIServiceClientPool"), + ASYNC_DATANODE_MPP_DATA_EXCHANGE_CLIENT_POOL("AsyncDataNodeMPPDataExchangeServiceClientPool"); private final String name; diff --git a/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java b/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java index 85f1d63ae6..c4a6b4d3cc 100644 --- a/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java +++ b/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java @@ -67,7 +67,7 @@ public class MockInternalRPCService extends ThriftService implements MockInterna new ThriftServiceThread( processor, getID().getName(), - ThreadName.INTERNAL_SERVICE_RPC_SERVER.getName(), + ThreadName.DATANODE_INTERNAL_RPC_SERVICE.getName(), getBindIP(), getBindPort(), 65535, @@ -77,7 +77,7 @@ public class MockInternalRPCService extends ThriftService implements MockInterna } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.INTERNAL_SERVICE_RPC_SERVER.getName()); + thriftServiceThread.setName(ThreadName.DATANODE_INTERNAL_RPC_SERVICE.getName()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java index ec96021c74..996e2372d5 100644 --- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java +++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java @@ -73,7 +73,7 @@ public class DataNodeClientPoolFactory { .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnable()) .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) .build(), - ThreadName.CONFIG_NODE_CLIENT_POOL_THREAD_NAME.getName()), + ThreadName.ASYNC_CONFIGNODE_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncConfigNodeIServiceClient>() .setMaxIdleClientForEachNode(conf.getCoreConnectionForInternalService()) .setMaxTotalClientForEachNode(conf.getMaxConnectionForInternalService()) @@ -135,7 +135,7 @@ public class DataNodeClientPoolFactory { .setRpcThriftCompressionEnabled(conf.isRpcThriftCompressionEnable()) .setSelectorNumOfAsyncClientManager(conf.getSelectorNumOfClientManager()) .build(), - ThreadName.DATA_NODE_MPP_DATA_EXCHANGE_CLIENT_POOL_THREAD_NAME.getName()), + ThreadName.ASYNC_DATANODE_MPP_DATA_EXCHANGE_CLIENT_POOL.getName()), new ClientPoolProperty.Builder<AsyncDataNodeMPPDataExchangeServiceClient>() .build() .getConfig()); diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java index 5dcd2866db..56df15a6ff 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java @@ -98,7 +98,7 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch new ThriftServiceThread( processor, getID().getName(), - ThreadName.MPP_DATA_EXCHANGE_RPC_CLIENT.getName(), + ThreadName.MPP_DATA_EXCHANGE_RPC_PROCESSOR.getName(), getBindIP(), getBindPort(), config.getRpcMaxConcurrentClientNum(), @@ -109,7 +109,7 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.MPP_DATA_EXCHANGE_RPC_SERVER.getName()); + thriftServiceThread.setName(ThreadName.MPP_DATA_EXCHANGE_RPC_SERVICE.getName()); MetricService.getInstance() .getOrCreateAutoGauge( Metric.THRIFT_ACTIVE_THREADS.toString(), @@ -117,7 +117,7 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch thriftServiceThread, AbstractThriftServiceThread::getActiveThreadCount, Tag.NAME.toString(), - ThreadName.MPP_DATA_EXCHANGE_RPC_SERVER.getName()); + ThreadName.MPP_DATA_EXCHANGE_RPC_SERVICE.getName()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java index 0724796e30..1aed9d999e 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java @@ -64,7 +64,7 @@ public class DataNodeInternalRPCService extends ThriftService new ThriftServiceThread( processor, getID().getName(), - ThreadName.INTERNAL_SERVICE_RPC_CLIENT.getName(), + ThreadName.DATANODE_INTERNAL_RPC_PROCESSOR.getName(), getBindIP(), getBindPort(), config.getRpcMaxConcurrentClientNum(), @@ -75,7 +75,7 @@ public class DataNodeInternalRPCService extends ThriftService } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.INTERNAL_SERVICE_RPC_SERVER.getName()); + thriftServiceThread.setName(ThreadName.DATANODE_INTERNAL_RPC_SERVICE.getName()); MetricService.getInstance() .getOrCreateAutoGauge( Metric.THRIFT_ACTIVE_THREADS.toString(), @@ -83,7 +83,7 @@ public class DataNodeInternalRPCService extends ThriftService thriftServiceThread, AbstractThriftServiceThread::getActiveThreadCount, Tag.NAME.toString(), - ThreadName.INTERNAL_SERVICE_RPC_SERVER.getName()); + ThreadName.DATANODE_INTERNAL_RPC_SERVICE.getName()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java index 3930e27fe2..5becc9302a 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java @@ -67,7 +67,7 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ new ThriftServiceThread( processor, getID().getName(), - ThreadName.INFLUXDB_CLIENT.getName(), + ThreadName.INFLUXDB_RPC_PROCESSOR.getName(), config.getRpcAddress(), config.getInfluxDBRpcPort(), config.getRpcMaxConcurrentClientNum(), @@ -77,7 +77,7 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.INFLUXDB_SERVICE.getName()); + thriftServiceThread.setName(ThreadName.INFLUXDB_RPC_SERVICE.getName()); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java index 9011945bd3..47b77d0606 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java @@ -38,7 +38,7 @@ import org.apache.iotdb.service.rpc.thrift.IClientRPCService.Processor; import java.lang.reflect.InvocationTargetException; -/** A service to handle jdbc request from client. */ +/** A service to handle RPC request from client. */ public class RPCService extends ThriftService implements RPCServiceMBean { private IClientRPCServiceWithHandler impl; @@ -72,7 +72,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean { new ThriftServiceThread( processor, getID().getName(), - ThreadName.RPC_CLIENT.getName(), + ThreadName.CLIENT_RPC_PROCESSOR.getName(), config.getRpcAddress(), config.getRpcPort(), config.getRpcMaxConcurrentClientNum(), @@ -82,7 +82,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean { } catch (RPCServiceException e) { throw new IllegalAccessException(e.getMessage()); } - thriftServiceThread.setName(ThreadName.RPC_SERVICE.getName()); + thriftServiceThread.setName(ThreadName.CLIENT_RPC_SERVICE.getName()); MetricService.getInstance() .getOrCreateAutoGauge( Metric.THRIFT_ACTIVE_THREADS.toString(), @@ -90,7 +90,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean { thriftServiceThread, AbstractThriftServiceThread::getActiveThreadCount, Tag.NAME.toString(), - ThreadName.RPC_SERVICE.getName()); + ThreadName.CLIENT_RPC_SERVICE.getName()); } @Override
