Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SystemPropertiesHandler use Files::move instead of File::renameTo #12770

Merged
merged 4 commits into from
Jun 19, 2024
Merged

SystemPropertiesHandler use Files::move instead of File::renameTo #12770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
529508e
Files.move
liyuheng55555 Jun 19, 2024
30c9b99
?
liyuheng55555 Jun 19, 2024
d25d0e0
?
liyuheng55555 Jun 19, 2024
fb70e52
?
liyuheng55555 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
7 changes: 5 additions & 2 deletions ...ore/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemPropertiesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 {
FileUtils.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);
}
}

Expand Down
Loading