HDFS-12192. Ozone: Fix the remaining failure tests for Windows caused by incorrect path generated. Contributed by Yiqun Lin.

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java

@@ -25,7 +25,6 @@ import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.OzoneConfiguration;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
 import org.apache.hadoop.scm.XceiverClientManager;
 import org.apache.hadoop.scm.XceiverClientSpi;
 import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -37,9 +36,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.TimeoutException;
@@ -69,9 +66,8 @@ public class TestBufferManager {
   @BeforeClass
   public static void init() throws IOException {
     config = new OzoneConfiguration();
-    File p = GenericTestUtils.getTestDir();
+    String path = GenericTestUtils.getTempPath(
-    String path = p.getPath().concat(
+        TestBufferManager.class.getSimpleName());
-        TestOzoneContainer.class.getSimpleName());
     config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -129,11 +125,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException {
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(
+        .getTempPath(TestBufferManager.class.getSimpleName()
-        TestOzoneContainer.class.getSimpleName() +
+            + RandomStringUtils.randomNumeric(4));
-            GenericTestUtils.getMethodName() +
-            RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -214,8 +208,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException{
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestBufferManager.class.getSimpleName()
+            + RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -258,8 +253,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException {
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestBufferManager.class.getSimpleName()
+            + RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -306,8 +302,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException {
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestBufferManager.class.getSimpleName()
+            + RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -354,8 +351,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException{
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestBufferManager.class.getSimpleName()
+            + RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -400,8 +398,9 @@ public class TestBufferManager {
       InterruptedException, TimeoutException{
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestBufferManager.class.getSimpleName()
+            + RandomStringUtils.randomNumeric(4));
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java

@@ -28,7 +28,6 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.OzoneConfiguration;
 import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
 import org.apache.hadoop.scm.XceiverClientManager;
 import org.apache.hadoop.scm.XceiverClientSpi;
 import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -42,7 +41,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
@@ -74,9 +72,8 @@ public class TestCBlockReadWrite {
   @BeforeClass
   public static void init() throws IOException {
     config = new OzoneConfiguration();
-    URL p = config.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(
+        .getTempPath(TestCBlockReadWrite.class.getSimpleName());
-        TestOzoneContainer.class.getSimpleName());
     config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -193,8 +190,8 @@ public class TestCBlockReadWrite {
       InterruptedException, TimeoutException {
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestCBlockReadWrite.class.getSimpleName());
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -282,8 +279,8 @@ public class TestCBlockReadWrite {
       InterruptedException, TimeoutException {
     // Create a new config so that this tests write metafile to new location
     OzoneConfiguration flushTestConfig = new OzoneConfiguration();
-    URL p = flushTestConfig.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+        .getTempPath(TestCBlockReadWrite.class.getSimpleName());
     flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java

@@ -29,7 +29,6 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.OzoneConfiguration;
 import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
 import org.apache.hadoop.scm.XceiverClientManager;
 import org.apache.hadoop.scm.XceiverClientSpi;
 import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -45,7 +44,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -80,9 +78,8 @@ public class TestLocalBlockCache {
   @BeforeClass
   public static void init() throws IOException {
     config = new OzoneConfiguration();
-    URL p = config.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(
+        .getTempPath(TestLocalBlockCache.class.getSimpleName());
-        TestOzoneContainer.class.getSimpleName());
     config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
     config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
     config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java

@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.net.URL;
 import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
@@ -94,9 +93,8 @@ public class TestDatanodeStateMachine {
     conf.setStrings(ScmConfigKeys.OZONE_SCM_NAMES,
         serverAddresses.toArray(new String[0]));
 
-    URL p = this.getClass().getResource("");
+    String path = GenericTestUtils
-    String path = p.getPath().concat(
+        .getTempPath(TestDatanodeStateMachine.class.getSimpleName());
-        TestDatanodeStateMachine.class.getSimpleName());
     testRoot = new File(path);
     if (!testRoot.mkdirs()) {
       LOG.info("Required directories already exist.");