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 ar...@apache.org on 2016/04/29 22:20:42 UTC
[46/50] [abbrv] hadoop git commit: HDFS-10260.
TestFsDatasetImpl#testCleanShutdownOfVolume often fails. Contributed by
Rushabh Shah.
HDFS-10260. TestFsDatasetImpl#testCleanShutdownOfVolume often fails. Contributed by Rushabh Shah.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af9b0005
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af9b0005
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af9b0005
Branch: refs/heads/HDFS-7240
Commit: af9b000535cc987f66327e2b2bfe08923ba24c13
Parents: ef0870a
Author: Kihwal Lee <ki...@apache.org>
Authored: Fri Apr 29 09:58:44 2016 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Fri Apr 29 09:58:44 2016 -0500
----------------------------------------------------------------------
.../datanode/fsdataset/impl/TestFsDatasetImpl.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/af9b0005/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
index 70e9332..9cf437b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
@@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.datanode.fsdataset.impl;
+import com.google.common.base.Supplier;
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
@@ -653,8 +654,8 @@ public class TestFsDatasetImpl {
out.hflush();
ExtendedBlock block = DFSTestUtil.getFirstBlock(fs, filePath);
- FsVolumeImpl volume = (FsVolumeImpl) dataNode.getFSDataset().getVolume(
- block);
+ final FsVolumeImpl volume = (FsVolumeImpl) dataNode.getFSDataset().
+ getVolume(block);
File finalizedDir = volume.getFinalizedDir(cluster.getNamesystem()
.getBlockPoolId());
@@ -669,9 +670,11 @@ public class TestFsDatasetImpl {
// Invoke the synchronous checkDiskError method
dataNode.getFSDataset().checkDataDir();
// Sleep for 1 second so that datanode can interrupt and cluster clean up
- Thread.sleep(1000);
- assertEquals("There are active threads still referencing volume: "
- + volume.getBasePath(), 0, volume.getReferenceCount());
+ GenericTestUtils.waitFor(new Supplier<Boolean>() {
+ @Override public Boolean get() {
+ return volume.getReferenceCount() == 0;
+ }
+ }, 100, 10);
LocatedBlock lb = DFSTestUtil.getAllBlocks(fs, filePath).get(0);
DatanodeInfo info = lb.getLocations()[0];
@@ -680,7 +683,7 @@ public class TestFsDatasetImpl {
Assert.fail("This is not a valid code path. "
+ "out.close should have thrown an exception.");
} catch (IOException ioe) {
- Assert.assertTrue(ioe.getMessage().contains(info.toString()));
+ GenericTestUtils.assertExceptionContains(info.toString(), ioe);
}
finalizedDir.setWritable(true);
finalizedDir.setExecutable(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org