Browse Source

HDFS-13676. TestEditLogRace fails on Windows. Contributed by Zuoming Zhang.

Inigo Goiri 6 years ago
parent
commit
eebeb6033f

+ 4 - 2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java

@@ -84,6 +84,8 @@ public class TestEditLogRace {
     TestEditLogRace.useAsyncEditLog = useAsyncEditLog;
     TestEditLogRace.useAsyncEditLog = useAsyncEditLog;
   }
   }
 
 
+  private static final String NAME_DIR = MiniDFSCluster.getBaseDirectory() + "name-0-1";
+
   private static final Log LOG = LogFactory.getLog(TestEditLogRace.class);
   private static final Log LOG = LogFactory.getLog(TestEditLogRace.class);
 
 
   // This test creates NUM_THREADS threads and each thread continuously writes
   // This test creates NUM_THREADS threads and each thread continuously writes
@@ -363,8 +365,8 @@ public class TestEditLogRace {
         useAsyncEditLog);
         useAsyncEditLog);
     FileSystem.setDefaultUri(conf, "hdfs://localhost:0");
     FileSystem.setDefaultUri(conf, "hdfs://localhost:0");
     conf.set(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY, "0.0.0.0:0");
     conf.set(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY, "0.0.0.0:0");
-    //conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, NAME_DIR);
-    //conf.set(DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY, NAME_DIR);
+    conf.set(DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY, NAME_DIR);
+    conf.set(DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY, NAME_DIR);
     conf.setBoolean(DFSConfigKeys.DFS_PERMISSIONS_ENABLED_KEY, false);
     conf.setBoolean(DFSConfigKeys.DFS_PERMISSIONS_ENABLED_KEY, false);
     return conf;
     return conf;
   }
   }