Repository: hadoop Updated Branches: refs/heads/branch-2 ab0f12708 -> 457895d50
Revert "HDFS-11399. Many tests fails in Windows due to injecting disk failures. Contributed by Yiqun Lin." This reverts commit ab0f12708452f22d3780a30b354f7f8a24366500. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/457895d5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/457895d5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/457895d5 Branch: refs/heads/branch-2 Commit: 457895d50f0c9bdbb3b498a1657956adde8fbc55 Parents: ab0f127 Author: Inigo Goiri <[email protected]> Authored: Mon Mar 12 11:44:06 2018 -0700 Committer: Inigo Goiri <[email protected]> Committed: Mon Mar 12 11:44:06 2018 -0700 ---------------------------------------------------------------------- .../server/blockmanagement/TestBlockStatsMXBean.java | 5 ----- .../hdfs/server/datanode/TestDataNodeVolumeFailure.java | 12 ------------ 2 files changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/457895d5/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java index 93fdb95..eb4f6d7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/457895d5/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java index 1ecbce5..216ecaf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java +++ b/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"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
