This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 940d678ef8 HDDS-7578. Wrong directory config used for SCM HA Ratis
Snapshot (#4030)
940d678ef8 is described below
commit 940d678ef8036255b77516646bafd23b2c9122bf
Author: Symious <[email protected]>
AuthorDate: Mon Feb 6 00:03:53 2023 +0800
HDDS-7578. Wrong directory config used for SCM HA Ratis Snapshot (#4030)
---
.../common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java | 2 +-
.../test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
index f07dc56f1f..0658da242f 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAUtils.java
@@ -146,7 +146,7 @@ public final class SCMHAUtils {
public static String getSCMRatisSnapshotDirectory(ConfigurationSource conf) {
String snapshotDir =
- conf.get(ScmConfigKeys.OZONE_SCM_HA_RATIS_STORAGE_DIR);
+ conf.get(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_DIR);
// If ratis snapshot directory is not set, fall back to ozone.metadata.dir.
if (Strings.isNullOrEmpty(snapshotDir)) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
index 50bd6980d6..cd8a7d2e68 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSCMInstallSnapshot.java
@@ -112,9 +112,12 @@ public class TestSCMInstallSnapshot {
provider.setPeerNodesMap(peerMap);
DBCheckpoint checkpoint =
provider.getSCMDBSnapshot(scmNodeDetails.getNodeId());
+ String snapshotDir =
+ conf.get(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_DIR);
final File[] files = FileUtil.listFiles(provider.getScmSnapshotDir());
Assert.assertTrue(files[0].getName().startsWith(
OzoneConsts.SCM_DB_NAME + "-" + scmNodeDetails.getNodeId()));
+ Assert.assertTrue(files[0].getAbsolutePath().startsWith(snapshotDir));
return checkpoint;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
