Repository: hadoop
Updated Branches:
  refs/heads/branch-2 aa8593f92 -> 1c0f2ef82


Revert "HDFS-10960. TestDataNodeHotSwapVolumes#testRemoveVolumeBeingWritten 
fails at disk error verification after volume remove. (Manoj Govindassamy via 
lei)"

This reverts commit aa8593f923e5686d8baa11bd00d227e48a860c13.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c0f2ef8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c0f2ef8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c0f2ef8

Branch: refs/heads/branch-2
Commit: 1c0f2ef82fcdd32c6375defaf50fb4c836fe40d7
Parents: aa8593f
Author: Kihwal Lee <kih...@apache.org>
Authored: Fri Oct 14 16:38:25 2016 -0500
Committer: Kihwal Lee <kih...@apache.org>
Committed: Fri Oct 14 16:38:25 2016 -0500

----------------------------------------------------------------------
 .../datanode/TestDataNodeHotSwapVolumes.java     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c0f2ef8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
----------------------------------------------------------------------
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
index 158efd6..c03b02b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
@@ -646,6 +646,8 @@ public class TestDataNodeHotSwapVolumes {
     final DataNode dn = cluster.getDataNodes().get(dataNodeIdx);
     final FileSystem fs = cluster.getFileSystem();
     final Path testFile = new Path("/test");
+    final long lastTimeDiskErrorCheck = dn.getLastDiskErrorCheck();
+
     FSDataOutputStream out = fs.create(testFile, REPLICATION);
 
     Random rb = new Random(0);
@@ -701,24 +703,17 @@ public class TestDataNodeHotSwapVolumes {
 
     reconfigThread.join();
 
-    // Verify if the data directory reconfigure was successful
-    FsDatasetSpi<? extends FsVolumeSpi> fsDatasetSpi = dn.getFSDataset();
-    try (FsDatasetSpi.FsVolumeReferences fsVolumeReferences = fsDatasetSpi
-        .getFsVolumeReferences()) {
-      for (int i =0; i < fsVolumeReferences.size(); i++) {
-        System.out.println("Vol: " +
-            fsVolumeReferences.get(i).getBaseURI().toString());
-      }
-      assertEquals("Volume remove wasn't successful.",
-          1, fsVolumeReferences.size());
-    }
-
     // Verify the file has sufficient replications.
     DFSTestUtil.waitReplication(fs, testFile, REPLICATION);
     // Read the content back
     byte[] content = DFSTestUtil.readFileBuffer(fs, testFile);
     assertEquals(BLOCK_SIZE, content.length);
 
+    // If an IOException thrown from BlockReceiver#run, it triggers
+    // DataNode#checkDiskError(). So we can test whether checkDiskError() is 
called,
+    // to see whether there is IOException in BlockReceiver#run().
+    assertEquals(lastTimeDiskErrorCheck, dn.getLastDiskErrorCheck());
+
     if (!exceptions.isEmpty()) {
       throw new IOException(exceptions.get(0).getCause());
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to