Browse Source

HDFS-12048. Ozone:TestOzoneContainerRatis & TestRatisManager are failing consistently. Contributed by Mukul Kumar Singh.

Weiwei Yang 8 years ago
parent
commit
e07662cb04

+ 4 - 1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java

@@ -113,9 +113,12 @@ public final class MiniOzoneCluster extends MiniDFSCluster
         getInstanceStorageDir(i, -1).getCanonicalPath());
     String containerMetaDirs = dnConf.get(
         OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS) + "-dn-" + i;
-    Files.createDirectories(Paths.get(containerMetaDirs));
+    Path containerMetaDirPath = Paths.get(containerMetaDirs);
     setConf(i, dnConf, OzoneConfigKeys.OZONE_CONTAINER_METADATA_DIRS,
         containerMetaDirs);
+    Path containerRootPath =
+        containerMetaDirPath.resolve(OzoneConsts.CONTAINER_ROOT_PREFIX);
+    Files.createDirectories(containerRootPath);
   }
 
   static void setConf(int i, Configuration conf, String key, String value) {