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 le...@apache.org on 2016/10/14 20:43:37 UTC
hadoop git commit: HDFS-10960.
TestDataNodeHotSwapVolumes#testRemoveVolumeBeingWritten fails at disk error
verification after volume remove. (Manoj Govindassamy via lei)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 86325e434 -> aa8593f92
HDFS-10960. TestDataNodeHotSwapVolumes#testRemoveVolumeBeingWritten fails at disk error verification after volume remove. (Manoj Govindassamy via lei)
(cherry picked from commit 8c520a27cbd9daba05367d3a83017a2eab5258eb)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aa8593f9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aa8593f9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aa8593f9
Branch: refs/heads/branch-2
Commit: aa8593f923e5686d8baa11bd00d227e48a860c13
Parents: 86325e4
Author: Lei Xu <le...@apache.org>
Authored: Fri Oct 14 13:41:59 2016 -0700
Committer: Lei Xu <le...@apache.org>
Committed: Fri Oct 14 13:43:26 2016 -0700
----------------------------------------------------------------------
.../datanode/TestDataNodeHotSwapVolumes.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa8593f9/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 c03b02b..158efd6 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,8 +646,6 @@ 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);
@@ -703,17 +701,24 @@ 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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org