This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 63caecc8c36 Fix error log when start confignode and datanode (#10820)
63caecc8c36 is described below
commit 63caecc8c36dd242228996e6e50052c3fa571b74
Author: Haonan <[email protected]>
AuthorDate: Wed Aug 9 19:44:17 2023 +0800
Fix error log when start confignode and datanode (#10820)
---
.../main/java/org/apache/iotdb/confignode/service/ConfigNode.java | 5 ++++-
.../iotdb/confignode/service/thrift/ConfigNodeRPCService.java | 5 -----
.../iotdb/consensus/iot/service/IoTConsensusRPCService.java | 8 ++++----
.../java/org/apache/iotdb/db/protocol/session/SessionManager.java | 6 +++++-
.../src/main/java/org/apache/iotdb/db/service/DataNode.java | 6 +++++-
.../concurrent/threadpool/WrappedScheduledExecutorService.java | 2 +-
.../concurrent/threadpool/WrappedSingleThreadExecutorService.java | 2 +-
.../threadpool/WrappedSingleThreadScheduledExecutor.java | 2 +-
.../commons/concurrent/threadpool/WrappedThreadPoolExecutor.java | 4 ++--
.../main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java | 4 ++--
.../main/java/org/apache/iotdb/commons/service/ServiceType.java | 5 ++++-
.../main/java/org/apache/iotdb/commons/service/ThriftService.java | 3 ++-
.../org/apache/iotdb/commons/service/metric/MetricService.java | 3 ++-
.../apache/iotdb/commons/client/mock/MockInternalRPCService.java | 4 ----
14 files changed, 33 insertions(+), 26 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 8caacd274ce..38dc19cfd0b 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.service.JMXService;
import org.apache.iotdb.commons.service.RegisterManager;
+import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.metric.JvmGcMonitorMetrics;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.utils.TestOnly;
@@ -87,7 +88,9 @@ public class ConfigNode implements ConfigNodeMBean {
private final String mbeanName =
String.format(
"%s:%s=%s",
- ConfigNodeConstant.CONFIGNODE_PACKAGE, ConfigNodeConstant.JMX_TYPE,
"ConfigNode");
+ IoTDBConstant.IOTDB_SERVICE_JMX_NAME,
+ ConfigNodeConstant.JMX_TYPE,
+ ServiceType.CONFIG_NODE.getJmxName());
private final RegisterManager registerManager = new RegisterManager();
private ConfigManager configManager;
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
index 824b02b3e23..b73ce6f8b08 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.confignode.service.thrift;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.runtime.RPCServiceException;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.ThriftService;
@@ -48,10 +47,6 @@ public class ConfigNodeRPCService extends ThriftService
implements ConfigNodeRPC
public void initSyncedServiceImpl(Object configNodeRPCServerProcessor) {
this.configNodeRPCServiceProcessor =
(ConfigNodeRPCServiceProcessor) configNodeRPCServerProcessor;
-
- super.mbeanName =
- String.format(
- "%s:%s=%s", this.getClass().getPackage(), IoTDBConstant.JMX_TYPE,
getID().getJmxName());
super.initSyncedServiceImpl(this.configNodeRPCServiceProcessor);
}
diff --git
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCService.java
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCService.java
index f80a0b8162c..567b23cefc6 100644
---
a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCService.java
+++
b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/iot/service/IoTConsensusRPCService.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.consensus.iot.service;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.concurrent.ThreadName;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.runtime.RPCServiceException;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.ThriftService;
@@ -30,11 +29,15 @@ import org.apache.iotdb.consensus.config.IoTConsensusConfig;
import org.apache.iotdb.consensus.iot.thrift.IoTConsensusIService;
import org.apache.thrift.TBaseAsyncProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.reflect.InvocationTargetException;
public class IoTConsensusRPCService extends ThriftService implements
IoTConsensusRPCServiceMBean {
+ private static final Logger logger =
LoggerFactory.getLogger(IoTConsensusRPCService.class);
+
private final TEndPoint thisNode;
private final IoTConsensusConfig config;
private IoTConsensusRPCServiceProcessor iotConsensusRPCServiceProcessor;
@@ -53,9 +56,6 @@ public class IoTConsensusRPCService extends ThriftService
implements IoTConsensu
public void initAsyncedServiceImpl(Object iotConsensusRPCServiceProcessor) {
this.iotConsensusRPCServiceProcessor =
(IoTConsensusRPCServiceProcessor) iotConsensusRPCServiceProcessor;
- super.mbeanName =
- String.format(
- "%s:%s=%s", this.getClass().getPackage(), IoTDBConstant.JMX_TYPE,
getID().getJmxName());
super.initAsyncedServiceImpl(this.iotConsensusRPCServiceProcessor);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
index 23f35fe17d3..aa604d2f5fb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.protocol.session;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.service.JMXService;
+import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
@@ -88,7 +89,10 @@ public class SessionManager implements SessionManagerMBean {
// singleton
String mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE,
"RpcSession");
+ "%s:%s=%s",
+ IoTDBConstant.IOTDB_SERVICE_JMX_NAME,
+ IoTDBConstant.JMX_TYPE,
+ ServiceType.SESSION_MANAGER.getJmxName());
JMXService.registerMBean(this, mbeanName);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
index 1230d9be8d2..4e05677c840 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -34,6 +34,7 @@ import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.pipe.plugin.meta.PipePluginMeta;
import org.apache.iotdb.commons.service.JMXService;
import org.apache.iotdb.commons.service.RegisterManager;
+import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.trigger.TriggerInformation;
import org.apache.iotdb.commons.trigger.exception.TriggerManagementException;
@@ -108,7 +109,10 @@ public class DataNode implements DataNodeMBean {
private final String mbeanName =
String.format(
- "%s:%s=%s", "org.apache.iotdb.datanode.service",
IoTDBConstant.JMX_TYPE, "DataNode");
+ "%s:%s=%s",
+ IoTDBConstant.IOTDB_SERVICE_JMX_NAME,
+ IoTDBConstant.JMX_TYPE,
+ ServiceType.DATA_NODE.getJmxName());
private static final File SYSTEM_PROPERTIES =
SystemFileFactory.INSTANCE.getFile(
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedScheduledExecutorService.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedScheduledExecutorService.java
index bd9f12fc96b..9ea0059a1f4 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedScheduledExecutorService.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedScheduledExecutorService.java
@@ -46,7 +46,7 @@ public class WrappedScheduledExecutorService
public WrappedScheduledExecutorService(ScheduledExecutorService service,
String mbeanName) {
this.mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_PACKAGE,
IoTDBConstant.JMX_TYPE, mbeanName);
+ "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_JMX_NAME,
IoTDBConstant.JMX_TYPE, mbeanName);
this.service = service;
JMXService.registerMBean(this, this.mbeanName);
ThreadPoolMetrics.getInstance().registerThreadPool(this, this.mbeanName);
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadExecutorService.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadExecutorService.java
index eb522f6d4c9..7e2663722f1 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadExecutorService.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadExecutorService.java
@@ -47,7 +47,7 @@ public class WrappedSingleThreadExecutorService
this.service = service;
this.mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_PACKAGE,
IoTDBConstant.JMX_TYPE, mbeanName);
+ "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_JMX_NAME,
IoTDBConstant.JMX_TYPE, mbeanName);
JMXService.registerMBean(this, this.mbeanName);
ThreadPoolMetrics.getInstance().registerThreadPool(this, this.mbeanName);
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
index ef9aa07c063..082bce0b194 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
@@ -47,7 +47,7 @@ public class WrappedSingleThreadScheduledExecutor
this.service = service;
this.mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_PACKAGE,
IoTDBConstant.JMX_TYPE, mbeanName);
+ "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_JMX_NAME,
IoTDBConstant.JMX_TYPE, mbeanName);
JMXService.registerMBean(this, this.mbeanName);
ThreadPoolMetrics.getInstance().registerThreadPool(this, this.mbeanName);
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
index facfdf64f20..d81c97f8454 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/concurrent/threadpool/WrappedThreadPoolExecutor.java
@@ -52,7 +52,7 @@ public class WrappedThreadPoolExecutor extends
ThreadPoolExecutor
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
threadFactory);
this.mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_PACKAGE,
IoTDBConstant.JMX_TYPE, mbeanName);
+ "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_JMX_NAME,
IoTDBConstant.JMX_TYPE, mbeanName);
JMXService.registerMBean(this, this.mbeanName);
ThreadPoolMetrics.getInstance().registerThreadPool(this, this.mbeanName);
}
@@ -68,7 +68,7 @@ public class WrappedThreadPoolExecutor extends
ThreadPoolExecutor
super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
ioTThreadFactory);
this.mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_PACKAGE,
IoTDBConstant.JMX_TYPE, mbeanName);
+ "%s:%s=%s", IoTDBConstant.IOTDB_THREADPOOL_JMX_NAME,
IoTDBConstant.JMX_TYPE, mbeanName);
JMXService.registerMBean(this, this.mbeanName);
ThreadPoolMetrics.getInstance().registerThreadPool(this, this.mbeanName);
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
index d4154b46820..b19f6f0ec63 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/IoTDBConstant.java
@@ -99,8 +99,8 @@ public class IoTDBConstant {
public static final String IOTDB_JMX_LOCAL = "iotdb.jmx.local";
public static final String IOTDB_JMX_PORT =
"com.sun.management.jmxremote.port";
- public static final String IOTDB_PACKAGE = "org.apache.iotdb.service";
- public static final String IOTDB_THREADPOOL_PACKAGE =
"org.apache.iotdb.threadpool";
+ public static final String IOTDB_SERVICE_JMX_NAME =
"org.apache.iotdb.service";
+ public static final String IOTDB_THREADPOOL_JMX_NAME =
"org.apache.iotdb.threadpool";
public static final String JMX_TYPE = "type";
public static final long PB = 1L << 50;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ServiceType.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ServiceType.java
index 5e43452898b..0c9e12e1170 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ServiceType.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ServiceType.java
@@ -76,7 +76,10 @@ public enum ServiceType {
PIPE_PLUGIN_CLASSLOADER_MANAGER_SERVICE(
"Pipe Plugin Classloader Manager Service", "PipePluginClassLoader"),
PIPE_RUNTIME_AGENT("Pipe Runtime Agent", "PipeRuntimeAgent"),
- MLNode_RPC_SERVICE("Rpc Service for MLNode", "MLNodeRPCService");
+ MLNode_RPC_SERVICE("Rpc Service for MLNode", "MLNodeRPCService"),
+ SESSION_MANAGER("Session Manager", "RpcSession"),
+ CONFIG_NODE("Config Node", "ConfigNode"),
+ DATA_NODE("Data Node", "DataNode");
private final String name;
private final String jmxName;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
index 5a4e6d8eaaa..1c755224dce 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
@@ -38,7 +38,8 @@ public abstract class ThriftService implements IService {
protected String mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE,
getID().getJmxName());
+ "%s:%s=%s",
+ IoTDBConstant.IOTDB_SERVICE_JMX_NAME, IoTDBConstant.JMX_TYPE,
getID().getJmxName());
protected AbstractThriftServiceThread thriftServiceThread;
protected TProcessor processor;
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/MetricService.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/MetricService.java
index 5e5a427f6d3..eea7c5f7aa0 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/MetricService.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/service/metric/MetricService.java
@@ -37,7 +37,8 @@ public class MetricService extends AbstractMetricService
implements MetricServic
private static final Logger LOGGER =
LoggerFactory.getLogger(MetricService.class);
private final String mbeanName =
String.format(
- "%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE,
getID().getJmxName());
+ "%s:%s=%s",
+ IoTDBConstant.IOTDB_SERVICE_JMX_NAME, IoTDBConstant.JMX_TYPE,
getID().getJmxName());
private MetricService() {
// empty constructor
diff --git
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
index c4a6b4d3cc0..771c6cf840a 100644
---
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
+++
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/client/mock/MockInternalRPCService.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.commons.client.mock;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.concurrent.ThreadName;
-import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.runtime.RPCServiceException;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.ThriftService;
@@ -49,9 +48,6 @@ public class MockInternalRPCService extends ThriftService
implements MockInterna
@Override
public void initSyncedServiceImpl(Object mockedProcessor) {
this.mockedProcessor = (IDataNodeRPCService.Iface) mockedProcessor;
- super.mbeanName =
- String.format(
- "%s:%s=%s", this.getClass().getPackage(), IoTDBConstant.JMX_TYPE,
getID().getJmxName());
super.initSyncedServiceImpl(this.mockedProcessor);
}
