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

Merge r1574997 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574999 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-03-06 18:52:38 +00:00
parent a9f2c50805
commit 59b3646382
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,6 +312,8 @@ Release 2.4.0 - UNRELEASED
HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change. HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change.
(Akira Ajisaka via wheat9) (Akira Ajisaka via wheat9)
HDFS-6062. TestRetryCacheWithHA#testConcat is flaky. (Jing Zhao via wheat9)
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9) HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRetryCacheWithHA.java
View File

@ -562,10 +562,12 @@ public class TestRetryCacheWithHA {
@Override @Override
void prepare() throws Exception { void prepare() throws Exception {
DFSTestUtil.createFile(dfs, new Path(target), BlockSize, DataNodes, 0); final Path targetPath = new Path(target);
DFSTestUtil.createFile(dfs, targetPath, BlockSize, DataNodes, 0);
for (int i = 0; i < srcPaths.length; i++) { for (int i = 0; i < srcPaths.length; i++) {
DFSTestUtil.createFile(dfs, srcPaths[i], BlockSize, DataNodes, 0); DFSTestUtil.createFile(dfs, srcPaths[i], BlockSize, DataNodes, 0);
} }
assertEquals(BlockSize, dfs.getFileStatus(targetPath).getLen());
} }
@Override @Override
@ -576,10 +578,12 @@ public class TestRetryCacheWithHA {
@Override @Override
boolean checkNamenodeBeforeReturn() throws Exception { boolean checkNamenodeBeforeReturn() throws Exception {
Path targetPath = new Path(target); Path targetPath = new Path(target);
boolean done = dfs.exists(targetPath); boolean done = dfs.getFileStatus(targetPath).getLen() == BlockSize
* (srcs.length + 1);
for (int i = 0; i < CHECKTIMES && !done; i++) { for (int i = 0; i < CHECKTIMES && !done; i++) {
Thread.sleep(1000); Thread.sleep(1000);
done = dfs.exists(targetPath); done = dfs.getFileStatus(targetPath).getLen() == BlockSize
* (srcs.length + 1);
} }
return done; return done;
} }