This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 26a9cdb HDDS-6101. use FileUtils.moveDirectory instead of Files.move
when installing snapshot (#2918)
26a9cdb is described below
commit 26a9cdb7a866ed919496991d93c51ac1731d2adc
Author: Jackson Yao <[email protected]>
AuthorDate: Wed Dec 22 19:55:20 2021 +0800
HDDS-6101. use FileUtils.moveDirectory instead of Files.move when
installing snapshot (#2918)
---
.../src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java | 2 +-
.../org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java | 3 ++-
.../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 5 -----
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
index 1c39892..78f8a80 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
@@ -201,7 +201,7 @@ public final class HAUtils {
// an inconsistent state and this marker file will fail it from
// starting up.
Files.createFile(markerFile);
- Files.move(checkpointPath, oldDB.toPath());
+ FileUtils.moveDirectory(checkpointPath, oldDB.toPath());
Files.deleteIfExists(markerFile);
} catch (IOException e) {
LOG.error("Failed to move downloaded DB checkpoint {} to metadata "
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 4632a46..248c90c 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -180,7 +180,8 @@ public class SCMDatanodeProtocolServer implements
public void start() {
LOG.info(
StorageContainerManager.buildRpcServerStartMessage(
- "RPC server for DataNodes", datanodeRpcAddress));
+ "ScmDatanodeProtocol RPC server for DataNodes",
+ datanodeRpcAddress));
protocolMessageMetrics.register();
datanodeRpcServer.start();
}
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index a3a1abb..85efdfb 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1320,11 +1320,6 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
}
getBlockProtocolServer().start();
- if (LOG.isInfoEnabled()) {
- LOG.info(buildRpcServerStartMessage("ScmDatanodeProtocl RPC " +
- "server", getDatanodeProtocolServer().getDatanodeRpcAddress()));
- }
-
// If HA is enabled, start datanode protocol server once leader is ready.
if (!scmStorageConfig.isSCMHAEnabled()) {
getDatanodeProtocolServer().start();
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index af30947..1640808 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -3332,7 +3332,7 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
// an inconsistent state and this marker file will fail OM from
// starting up.
Files.createFile(markerFile);
- Files.move(checkpointPath, oldDB.toPath());
+ FileUtils.moveDirectory(checkpointPath, oldDB.toPath());
Files.deleteIfExists(markerFile);
} catch (IOException e) {
LOG.error("Failed to move downloaded DB checkpoint {} to metadata " +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
