HDFS-13632. Randomize baseDir for MiniJournalCluster in MiniQJMHACluster for TestDFSAdminWithHA. Contributed by Anbang Hu.
(cherry picked from commit 6b9ef2d5b7d26f9e92b3be5d97059299a064444c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abe20e91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abe20e91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abe20e91 Branch: refs/heads/branch-2.9 Commit: abe20e914e1b9e6f6cae01a99708902657b6f3ca Parents: 6a4ae6f Author: Inigo Goiri <inigo...@apache.org> Authored: Wed May 30 10:10:25 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Wed May 30 10:12:34 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java | 12 +++++++++--- .../apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/abe20e91/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 5caccf4..5201da3 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 @@ -52,7 +52,8 @@ public class MiniQJMHACluster { private final Configuration conf; private StartupOption startOpt = null; private final MiniDFSCluster.Builder dfsBuilder; - + private String baseDir; + public Builder(Configuration conf) { this.conf = conf; // most QJMHACluster tests don't need DataNodes, so we'll make @@ -71,6 +72,11 @@ public class MiniQJMHACluster { public void startupOption(StartupOption startOpt) { this.startOpt = startOpt; } + + public Builder baseDir(String d) { + this.baseDir = d; + return this; + } } public static MiniDFSNNTopology createDefaultTopology(int basePort) { @@ -92,8 +98,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(); URI journalURI = journalCluster.getQuorumJournalURI(NAMESERVICE); http://git-wip-us.apache.org/repos/asf/hadoop/blob/abe20e91/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 97daf09..abd96d0 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 @@ -29,6 +29,7 @@ import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.HAUtil; import org.apache.hadoop.hdfs.qjournal.MiniQJMHACluster; +import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; import org.junit.Test; @@ -82,7 +83,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
