You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/03/12 18:43:38 UTC
hadoop git commit: Revert "HDFS-11399. Many tests fails in Windows
due to injecting disk failures. Contributed by Yiqun Lin."
Repository: hadoop
Updated Branches:
refs/heads/branch-2.9 9e1e95572 -> 4c612a10a
Revert "HDFS-11399. Many tests fails in Windows due to injecting disk failures. Contributed by Yiqun Lin."
This reverts commit 9e1e955722e2f5bc0cafa20e1c3d5088fec8b6e4.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c612a10
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c612a10
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c612a10
Branch: refs/heads/branch-2.9
Commit: 4c612a10a3da37d12f3be4b0efa2588855295355
Parents: 9e1e955
Author: Inigo Goiri <in...@apache.org>
Authored: Mon Mar 12 11:43:27 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Mon Mar 12 11:43:27 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/4c612a10/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/4c612a10/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org