浏览代码

HDFS-13587. TestQuorumJournalManager fails on Windows. Contributed by Anbang Hu.

(cherry picked from commit c13dea87d9de7a9872fc8b0c939b41b1666a61e5)
Inigo Goiri 7 年之前
父节点
当前提交
c5f29d62eb

+ 5 - 0
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.MiniDFSCluster;
 import org.apache.hadoop.hdfs.qjournal.client.QuorumJournalManager;
 import org.apache.hadoop.hdfs.qjournal.client.QuorumJournalManager;
 import org.apache.hadoop.hdfs.qjournal.server.JournalNode;
 import org.apache.hadoop.hdfs.qjournal.server.JournalNode;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
 import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.net.NetUtils;
 
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Joiner;
@@ -50,6 +51,10 @@ public class MiniJournalCluster {
     private int numJournalNodes = 3;
     private int numJournalNodes = 3;
     private boolean format = true;
     private boolean format = true;
     private final Configuration conf;
     private final Configuration conf;
+
+    static {
+      DefaultMetricsSystem.setMiniClusterMode(true);
+    }
     
     
     public Builder(Configuration conf) {
     public Builder(Configuration conf) {
       this.conf = conf;
       this.conf = conf;

+ 2 - 1
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);
     conf.setInt(CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY, 0);
     
     
     cluster = new MiniJournalCluster.Builder(conf)
     cluster = new MiniJournalCluster.Builder(conf)
-      .build();
+        .baseDir(GenericTestUtils.getRandomizedTestDir().getAbsolutePath())
+        .build();
     cluster.waitActive();
     cluster.waitActive();
     
     
     qjm = createSpyingQJM();
     qjm = createSpyingQJM();