Repository: hadoop Updated Branches: refs/heads/branch-2 468b330fe -> 74092f214
HDFS-9148. Incorrect assert message in TestWriteToReplica#testWriteToTemporary (Tony Wu via Lei (Eddy) Xu) (cherry picked from commit 50741cb568d4da30b92d4954928bc3039e583b22) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74092f21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74092f21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74092f21 Branch: refs/heads/branch-2 Commit: 74092f21440798e52caa40ebc7806518152899b9 Parents: 468b330 Author: Lei Xu <[email protected]> Authored: Mon Sep 28 13:23:19 2015 -0700 Committer: Lei Xu <[email protected]> Committed: Mon Sep 28 13:28:08 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/74092f21/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 b9179a1..03d466c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -640,6 +640,9 @@ Release 2.8.0 - UNRELEASED HDFS-9080. Update htrace version to 4.0.1 (cmccabe) + HDFS-9148. Incorrect assert message in TestWriteToReplica#testWriteToTemporary + (Tony Wu via lei) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/74092f21/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java index a77184b..678654a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java @@ -517,8 +517,8 @@ public class TestWriteToReplica { Assert.assertTrue( replicaInfo.getBlockId() == blocks[NON_EXISTENT].getBlockId()); } catch (ReplicaAlreadyExistsException e) { - Assert.fail("createRbw() Should have removed the block with the older " - + "genstamp and replaced it with the newer one: " + blocks[NON_EXISTENT]); + Assert.fail("createTemporary should have allowed the block with newer " + + " generation stamp to be created " + blocks[NON_EXISTENT]); } }
