소스 검색

Revert "HDFS-11399. Many tests fails in Windows due to injecting disk failures. Contributed by Yiqun Lin."

This reverts commit 9e1e955722e2f5bc0cafa20e1c3d5088fec8b6e4.
Inigo Goiri 7 년 전
부모
커밋
4c612a10a3

+ 0 - 5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java

@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.hdfs.server.blockmanagement;
 
-import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -161,10 +160,6 @@ public class TestBlockStatsMXBean {
 
   @Test
   public void testStorageTypeStatsWhenStorageFailed() throws Exception {
-    // The test uses DataNodeTestUtils#injectDataDirFailure() to simulate
-    // volume failures which is currently not supported on Windows.
-    assumeNotWindows();
-
     DFSTestUtil.createFile(cluster.getFileSystem(),
         new Path("/blockStatsFile1"), 1024, (short) 1, 0L);
     Map<StorageType, StorageTypeStats> storageTypeStatsMap = cluster

+ 0 - 12
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java

@@ -307,10 +307,6 @@ public class TestDataNodeVolumeFailure {
   @Test(timeout=10000)
   public void testDataNodeShutdownAfterNumFailedVolumeExceedsTolerated()
       throws InterruptedException, IOException {
-    // The test uses DataNodeTestUtils#injectDataDirFailure() to simulate
-    // volume failures which is currently not supported on Windows.
-    assumeNotWindows();
-
     // make both data directories to fail on dn0
     final File dn0Vol1 = new File(dataDir, "data" + (2 * 0 + 1));
     final File dn0Vol2 = new File(dataDir, "data" + (2 * 0 + 2));
@@ -330,10 +326,6 @@ public class TestDataNodeVolumeFailure {
   @Test
   public void testVolumeFailureRecoveredByHotSwappingVolume()
       throws InterruptedException, ReconfigurationException, IOException {
-    // The test uses DataNodeTestUtils#injectDataDirFailure() to simulate
-    // volume failures which is currently not supported on Windows.
-    assumeNotWindows();
-
     final File dn0Vol1 = new File(dataDir, "data" + (2 * 0 + 1));
     final File dn0Vol2 = new File(dataDir, "data" + (2 * 0 + 2));
     final DataNode dn0 = cluster.getDataNodes().get(0);
@@ -372,10 +364,6 @@ public class TestDataNodeVolumeFailure {
   @Test
   public void testTolerateVolumeFailuresAfterAddingMoreVolumes()
       throws InterruptedException, ReconfigurationException, IOException {
-    // The test uses DataNodeTestUtils#injectDataDirFailure() to simulate
-    // volume failures which is currently not supported on Windows.
-    assumeNotWindows();
-
     final File dn0Vol1 = new File(dataDir, "data" + (2 * 0 + 1));
     final File dn0Vol2 = new File(dataDir, "data" + (2 * 0 + 2));
     final File dn0VolNew = new File(dataDir, "data_new");