You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/10/19 11:22:21 UTC
[iotdb] 02/02: resolve conversation
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch remove_list
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5d833330084b0d32143d4a137965f26020423857
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Oct 19 19:22:08 2023 +0800
resolve conversation
---
.../org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java | 3 +++
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
.../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 ++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 51e285587ec..30bff472433 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -182,6 +182,9 @@ public class ConfigNodeDescriptor {
}
if (seedConfigNode != null) {
conf.setSeedConfigNode(NodeUrlUtils.parseTEndPointUrls(seedConfigNode.trim()).get(0));
+ } else {
+ throw new IOException(
+ "The parameter dn_seed_config_node is not set, this ConfigNode will not join in any cluster.");
}
conf.setSeriesSlotNum(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 46bc66a9960..68b99f215a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -2925,8 +2925,8 @@ public class IoTDBConfig {
return seedConfigNode;
}
- public void setSeedConfigNode(List<TEndPoint> seedConfigNodes) {
- this.seedConfigNode = seedConfigNodes.get(0);
+ public void setSeedConfigNode(TEndPoint seedConfigNode) {
+ this.seedConfigNode = seedConfigNode;
}
public long getJoinClusterRetryIntervalMs() {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 881099f811f..cf239a071af 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -220,7 +220,7 @@ public class IoTDBDescriptor {
}
}
- public void loadProperties(Properties properties) throws BadNodeUrlException {
+ public void loadProperties(Properties properties) throws BadNodeUrlException, IOException {
conf.setClusterSchemaLimitLevel(
properties
.getProperty("cluster_schema_limit_level", conf.getClusterSchemaLimitLevel())
@@ -2015,7 +2015,7 @@ public class IoTDBDescriptor {
false));
}
- public void loadClusterProps(Properties properties) {
+ public void loadClusterProps(Properties properties) throws IOException {
String configNodeUrls = properties.getProperty(IoTDBConstant.DN_SEED_CONFIG_NODE);
if (configNodeUrls == null) {
configNodeUrls = properties.getProperty(IoTDBConstant.DN_TARGET_CONFIG_NODE_LIST);
@@ -2027,10 +2027,13 @@ public class IoTDBDescriptor {
if (configNodeUrls != null) {
try {
configNodeUrls = configNodeUrls.trim();
- conf.setSeedConfigNode(NodeUrlUtils.parseTEndPointUrls(configNodeUrls));
+ conf.setSeedConfigNode(NodeUrlUtils.parseTEndPointUrls(configNodeUrls).get(0));
} catch (BadNodeUrlException e) {
logger.error("ConfigNodes are set in wrong format, please set them like 127.0.0.1:10710");
}
+ } else {
+ throw new IOException(
+ "The parameter dn_seed_config_node is not set, this DataNode will not join in any cluster.");
}
conf.setInternalAddress(