Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1350384 from trunk for HDFS-3524. Update TestFileLengthOnClusterRestart for HDFS-3522. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350385 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2012-06-14 20:18:36 +00:00
parent 497de4942a
commit 94a5971872
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -215,6 +215,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3480. Multiple SLF4J binding warning. (Vinay via eli)
HDFS-3524. Update TestFileLengthOnClusterRestart for HDFS-3522. (Brandon
Li via szetszwo)
BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileLengthOnClusterRestart.java
View File

@ -65,8 +65,8 @@ public void testFileLengthWithHSyncAndClusterRestartWithOutDNsRegister()
in = (HdfsDataInputStream) dfs.open(path);
Assert.fail("Expected IOException");
} catch (IOException e) {
Assert.assertEquals("Could not obtain the last block locations.", e
.getLocalizedMessage());
Assert.assertTrue(e.getLocalizedMessage().indexOf(
"Name node is in safe mode") >= 0);
}
} finally {
if (null != in) {