HDFS-10260. TestFsDatasetImpl#testCleanShutdownOfVolume often fails. Contributed by Rushabh Shah.
(cherry picked from commit af9b000535cc987f66327e2b2bfe08923ba24c13) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4db3729 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4db3729 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4db3729 Branch: refs/heads/branch-2.8 Commit: a4db3729be30ea247a7b699ac76e1d195b1a8fdc Parents: 50d06ac Author: Kihwal Lee <[email protected]> Authored: Fri Apr 29 10:05:58 2016 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Apr 29 10:05:58 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/a4db3729/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 67808bf..ac9c508 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; @@ -556,8 +557,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()); @@ -572,9 +573,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]; @@ -583,7 +586,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: [email protected] For additional commands, e-mail: [email protected]
