HDFS-13632. Randomize baseDir for MiniJournalCluster in MiniQJMHACluster for TestDFSAdminWithHA. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8197b9b5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8197b9b5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8197b9b5 Branch: refs/heads/HDDS-48 Commit: 8197b9b56040113806bdf328bbee68e95dd0aadd Parents: e44c084 Author: Inigo Goiri <inigo...@apache.org> Authored: Wed May 30 10:02:19 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Wed May 30 10:13:52 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java | 10 ++++++++-- .../org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8197b9b5/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java index 1005f7f..f1f74dc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java @@ -49,6 +49,7 @@ public class MiniQJMHACluster { private int numNNs = 2; private final MiniDFSCluster.Builder dfsBuilder; private boolean forceRemoteEditsOnly = false; + private String baseDir; public Builder(Configuration conf) { this.conf = conf; @@ -69,6 +70,11 @@ public class MiniQJMHACluster { this.startOpt = startOpt; } + public Builder baseDir(String d) { + this.baseDir = d; + return this; + } + public Builder setNumNameNodes(int nns) { this.numNNs = nns; return this; @@ -104,8 +110,8 @@ public class MiniQJMHACluster { basePort = 10000 + RANDOM.nextInt(1000) * 4; LOG.info("Set MiniQJMHACluster basePort to " + basePort); // start 3 journal nodes - journalCluster = new MiniJournalCluster.Builder(conf).format(true) - .build(); + journalCluster = new MiniJournalCluster.Builder(conf) + .baseDir(builder.baseDir).format(true).build(); journalCluster.waitActive(); journalCluster.setNamenodeSharedEditsConf(NAMESERVICE); URI journalURI = journalCluster.getQuorumJournalURI(NAMESERVICE); http://git-wip-us.apache.org/repos/asf/hadoop/blob/8197b9b5/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java index b21084e..aa4d481 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.qjournal.MiniQJMHACluster; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants; import org.apache.hadoop.hdfs.server.namenode.ha.BootstrapStandby; +import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; import org.junit.Test; @@ -85,7 +86,8 @@ public class TestDFSAdminWithHA { conf = new Configuration(); conf.setBoolean(CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION, security); - cluster = new MiniQJMHACluster.Builder(conf).build(); + String baseDir = GenericTestUtils.getRandomizedTempPath(); + cluster = new MiniQJMHACluster.Builder(conf).baseDir(baseDir).build(); setHAConf(conf, cluster.getDfsCluster().getNameNode(0).getHostAndPort(), cluster.getDfsCluster().getNameNode(1).getHostAndPort()); cluster.getDfsCluster().getNameNode(0).getHostAndPort(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
