You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2018/02/16 18:32:06 UTC
[2/2] hadoop git commit: HDFS-13058. Fix
dfs.namenode.shared.edits.dir in TestJournalNode. Contributed by Bharat
Viswanadham.
HDFS-13058. Fix dfs.namenode.shared.edits.dir in TestJournalNode. Contributed by Bharat Viswanadham.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c880a871
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c880a871
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c880a871
Branch: refs/heads/branch-3.1
Commit: c880a87101773987c36438f9207cad253964e23a
Parents: f43f32b
Author: Arpit Agarwal <ar...@apache.org>
Authored: Fri Feb 16 10:29:22 2018 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Fri Feb 16 10:29:29 2018 -0800
----------------------------------------------------------------------
.../hdfs/qjournal/server/TestJournalNode.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c880a871/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
index 581218d..8d58792 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNode.java
@@ -83,6 +83,7 @@ public class TestJournalNode {
File editsDir = new File(MiniDFSCluster.getBaseDirectory() +
File.separator + "TestJournalNode");
FileUtil.fullyDelete(editsDir);
+ journalId = "test-journalid-" + GenericTestUtils.uniqueSequenceId();
if (testName.getMethodName().equals("testJournalDirPerNameSpace")) {
setFederationConf();
@@ -113,33 +114,33 @@ public class TestJournalNode {
conf.setBoolean(DFSConfigKeys.DFS_JOURNALNODE_ENABLE_SYNC_KEY,
false);
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
- "qjournal://jn0:9900;jn1:9901");
+ "qjournal://jn0:9900;jn1:9901/" + journalId);
} else if (testName.getMethodName().equals(
"testJournalNodeSyncerNotStartWhenSyncEnabledIncorrectURI")) {
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
- "qjournal://journal0\\:9900;journal1:9901");
+ "qjournal://journal0\\:9900;journal1:9901/" + journalId);
} else if (testName.getMethodName().equals(
"testJournalNodeSyncerNotStartWhenSyncEnabled")) {
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY,
- "qjournal://jn0:9900;jn1:9901");
+ "qjournal://jn0:9900;jn1:9901/" + journalId);
} else if (testName.getMethodName().equals(
"testJournalNodeSyncwithFederationTypeConfigWithNameServiceId")) {
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1",
- "qjournal://journalnode0:9900;journalnode0:9901");
+ "qjournal://journalnode0:9900;journalnode0:9901/" + journalId);
} else if (testName.getMethodName().equals(
"testJournalNodeSyncwithFederationTypeConfigWithNamenodeId")) {
conf.set(DFSConfigKeys.DFS_HA_NAMENODES_KEY_PREFIX + ".ns1", "nn1,nn2");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn1",
- "qjournal://journalnode0:9900;journalnode1:9901");
+ "qjournal://journalnode0:9900;journalnode1:9901/" +journalId);
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn2",
- "qjournal://journalnode0:9900;journalnode1:9901");
+ "qjournal://journalnode0:9900;journalnode1:9901/" +journalId);
} else if (testName.getMethodName().equals(
"testJournalNodeSyncwithFederationTypeIncorrectConfigWithNamenodeId")) {
conf.set(DFSConfigKeys.DFS_HA_NAMENODES_KEY_PREFIX + ".ns1", "nn1,nn2");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn1",
- "qjournal://journalnode0:9900;journalnode1:9901");
+ "qjournal://journalnode0:9900;journalnode1:9901/" + journalId);
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn2",
- "qjournal://journalnode0:9902;journalnode1:9903");
+ "qjournal://journalnode0:9902;journalnode1:9903/" + journalId);
}
jn = new JournalNode();
jn.setConf(conf);
@@ -161,7 +162,6 @@ public class TestJournalNode {
journal.format(fakeNameSpaceInfo);
}
} else {
- journalId = "test-journalid-" + GenericTestUtils.uniqueSequenceId();
journal = jn.getOrCreateJournal(journalId);
journal.format(FAKE_NSINFO);
}
@@ -176,16 +176,16 @@ public class TestJournalNode {
//ns1
conf.set(DFSConfigKeys.DFS_HA_NAMENODES_KEY_PREFIX + ".ns1", "nn1,nn2");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn1",
- "qjournal://journalnode0:9900;journalnode1:9901/ns1");
+ "qjournal://journalnode0:9900;journalnode1:9901/test-journalid-ns1");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns1" +".nn2",
- "qjournal://journalnode0:9900;journalnode1:9901/ns2");
+ "qjournal://journalnode0:9900;journalnode1:9901/test-journalid-ns1");
//ns2
conf.set(DFSConfigKeys.DFS_HA_NAMENODES_KEY_PREFIX + ".ns2", "nn3,nn4");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns2" +".nn3",
- "qjournal://journalnode0:9900;journalnode1:9901/ns2");
+ "qjournal://journalnode0:9900;journalnode1:9901/test-journalid-ns2");
conf.set(DFSConfigKeys.DFS_NAMENODE_SHARED_EDITS_DIR_KEY +".ns2" +".nn4",
- "qjournal://journalnode0:9900;journalnode1:9901/ns2");
+ "qjournal://journalnode0:9900;journalnode1:9901/test-journalid-ns2");
}
@After
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org