From 529508e838f577c7146096a86d015e9dca55094f Mon Sep 17 00:00:00 2001 From: liyuheng Date: Wed, 19 Jun 2024 19:34:44 +0800 Subject: [PATCH 1/4] Files.move --- .../main/java/org/apache/iotdb/db/service/DataNode.java | 2 ++ .../apache/iotdb/commons/file/SystemPropertiesHandler.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 c057c3392e579..f6fef6846c0bb 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 @@ -194,9 +194,11 @@ protected void doAddNode() { isFirstStart = prepareDataNode(); if (isFirstStart) { + logger.info("DataNode is starting for the first time..."); ConfigNodeInfo.getInstance() .updateConfigNodeList(Collections.singletonList(config.getSeedConfigNode())); } else { + logger.info("DataNode is restarting..."); // Load registered ConfigNodes from system.properties ConfigNodeInfo.getInstance().loadConfigNodeList(); } diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java index 61bcbb49b0cb9..f02213f77386c 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java @@ -31,6 +31,7 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.Arrays; import java.util.Properties; import java.util.concurrent.locks.ReadWriteLock; @@ -158,12 +159,14 @@ private void replaceFormalFile() throws IOException { "Delete formal system properties file fail: %s", formalFile.getAbsoluteFile()); throw new IOException(msg); } - if (!tmpFile.renameTo(formalFile)) { + try { + Files.move(tmpFile.toPath(), formalFile.toPath()); + } catch (IOException e) { String msg = String.format( "Failed to replace formal system properties file, you may manually rename it: %s -> %s", tmpFile.getAbsolutePath(), formalFile.getAbsolutePath()); - throw new IOException(msg); + throw new IOException(msg, e); } } From 30c9b992c1860b3be5d927df72fcfbcfd8ee9048 Mon Sep 17 00:00:00 2001 From: liyuheng Date: Wed, 19 Jun 2024 19:39:48 +0800 Subject: [PATCH 2/4] ? --- .../src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java index 64cdbe20e76a3..a91a8d7f7fc06 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java @@ -216,8 +216,6 @@ public void checkSystemConfig() throws ConfigurationException, IOException { properties = systemPropertiesHandler.read(); if (systemPropertiesHandler.isFirstStart()) { - // overwrite system.properties when first start - generateOrOverwriteSystemPropertiesFile(); if (config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS) && config.getWalMode().equals(WALMode.DISABLE)) { throw new ConfigurationException( From d25d0e035ff18dec267c24f1ec775f45868d0088 Mon Sep 17 00:00:00 2001 From: liyuheng Date: Wed, 19 Jun 2024 19:45:07 +0800 Subject: [PATCH 3/4] ? --- .../org/apache/iotdb/commons/file/SystemPropertiesHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java index f02213f77386c..e8a084fa30b0b 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java @@ -20,6 +20,7 @@ package org.apache.iotdb.commons.file; import org.apache.ratis.util.AutoCloseableLock; +import org.apache.ratis.util.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -160,7 +161,7 @@ private void replaceFormalFile() throws IOException { throw new IOException(msg); } try { - Files.move(tmpFile.toPath(), formalFile.toPath()); + FileUtils.move(tmpFile.toPath(), formalFile.toPath()); } catch (IOException e) { String msg = String.format( From fb70e528b8562659b24292292d54b93d24a852a5 Mon Sep 17 00:00:00 2001 From: liyuheng Date: Wed, 19 Jun 2024 19:57:03 +0800 Subject: [PATCH 4/4] ? --- .../org/apache/iotdb/commons/file/SystemPropertiesHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java index e8a084fa30b0b..552d408f9fc10 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java @@ -32,7 +32,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.Arrays; import java.util.Properties; import java.util.concurrent.locks.ReadWriteLock;