Repository: hadoop Updated Branches: refs/heads/branch-2.7 b8e01da1b -> 0467efcc0
HDFS-10372. Fix for failing TestFsDatasetImpl#testCleanShutdownOfVolume. Contributed by Rushabh Shah. (cherry picked from commit b9e5a32fa14b727b44118ec7f43fb95de05a7c2c) Added a CHANGES.txt entry. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0467efcc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0467efcc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0467efcc Branch: refs/heads/branch-2.7 Commit: 0467efcc09e5ec4d6362260c42445e444dccd93c Parents: b8e01da Author: Kihwal Lee <[email protected]> Authored: Mon May 9 15:56:51 2016 -0500 Committer: Kihwal Lee <[email protected]> Committed: Mon May 9 15:56:51 2016 -0500 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0467efcc/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 64fb5c2..da23efe 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -172,6 +172,9 @@ Release 2.7.3 - UNRELEASED HDFS-2043. TestHFlush failing intermittently. (Lin Yiqun via iwasakims) + HDFS-10372. Fix for failing TestFsDatasetImpl#testCleanShutdownOfVolume. + (Rushabh Shah via kihwal) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0467efcc/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 b3827c7..f62b2f1 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 @@ -495,7 +495,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.getXferAddr(), ioe); } finalizedDir.setWritable(true); finalizedDir.setExecutable(true); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
