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 yj...@apache.org on 2016/01/14 22:12:35 UTC
[2/2] hadoop git commit: HDFS-9648. TestStartup.testImageChecksum is
broken by HDFS-9569's message change. (Wei-Chiu Chuang via Yongjun Zhang)
HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message change. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit 817cc1f02a60ef4e372171415058fdc76c0d2e39)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f2eea3a1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f2eea3a1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f2eea3a1
Branch: refs/heads/branch-2.8
Commit: f2eea3a1b4d85278fdbbb574b680e274306099a0
Parents: a7d33b9
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Thu Jan 14 12:36:36 2016 -0800
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Thu Jan 14 13:06:23 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2eea3a1/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 5954778..13e4aec 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1697,6 +1697,9 @@ Release 2.7.3 - UNRELEASED
HDFS-8914. Document HA support in the HDFS HdfsDesign.md.
(Lars Francke via wheat9)
+ HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message
+ change. (Wei-Chiu Chuang via Yongjun Zhang)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2eea3a1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
index b8dda2a..9a7b9b5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
@@ -543,7 +543,7 @@ public class TestStartup {
fail("Should not have successfully started with corrupt image");
} catch (IOException ioe) {
GenericTestUtils.assertExceptionContains(
- "Failed to load an FSImage file!", ioe);
+ "Failed to load FSImage file", ioe);
int md5failures = appender.countExceptionsWithMessage(
" is corrupt with MD5 checksum of ");
// Two namedirs, so should have seen two failures