Repository: hadoop Updated Branches: refs/heads/branch-2 50c39db1a -> c5ff9553f refs/heads/branch-2.9 3e16a7475 -> 8347a6cb7 refs/heads/branch-3.0 8d8ef081a -> c5f29d62e refs/heads/branch-3.1 76f38f3f8 -> a13849637 refs/heads/trunk 51ce02bb5 -> c13dea87d
HDFS-13587. TestQuorumJournalManager fails on Windows. 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/c13dea87 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c13dea87 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c13dea87 Branch: refs/heads/trunk Commit: c13dea87d9de7a9872fc8b0c939b41b1666a61e5 Parents: 51ce02b Author: Inigo Goiri <inigo...@apache.org> Authored: Wed May 23 11:36:03 2018 -0700 Committer: Inigo Goiri <inigo...@apache.org> Committed: Wed May 23 11:36:03 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java | 5 +++++ .../hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c13dea87/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java index 2314e22..f936d75 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniJournalCluster.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.qjournal.client.QuorumJournalManager; import org.apache.hadoop.hdfs.qjournal.server.JournalNode; +import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.net.NetUtils; import com.google.common.base.Joiner; @@ -50,6 +51,10 @@ public class MiniJournalCluster { private int numJournalNodes = 3; private boolean format = true; private final Configuration conf; + + static { + DefaultMetricsSystem.setMiniClusterMode(true); + } public Builder(Configuration conf) { this.conf = conf; http://git-wip-us.apache.org/repos/asf/hadoop/blob/c13dea87/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java index 34a0348..69856ae 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java @@ -93,7 +93,8 @@ public class TestQuorumJournalManager { conf.setInt(CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY, 0); cluster = new MiniJournalCluster.Builder(conf) - .build(); + .baseDir(GenericTestUtils.getRandomizedTestDir().getAbsolutePath()) + .build(); cluster.waitActive(); qjm = createSpyingQJM(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
