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

HDFS-3060. svn merge -c 1298044 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298045 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-03-07 19:16:42 +00:00
parent 52007208ba
commit 1061a1ea76
2 changed files with 3 additions and 1 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

@ -105,6 +105,8 @@ Release 0.23.3 - UNRELEASED
HDFS-1580. Add interface for generic Write Ahead Logging mechanisms. HDFS-1580. Add interface for generic Write Ahead Logging mechanisms.
(Ivan Kelly via jitendra) (Ivan Kelly via jitendra)
HDFS-3060. Bump TestDistributedUpgrade#testDistributedUpgrade timeout (eli)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-2477. Optimize computing the diff between a block report and the HDFS-2477. Optimize computing the diff between a block report and the
namenode state. (Tomasz Nykiel via hairong) namenode state. (Tomasz Nykiel via hairong)

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java
View File

@ -96,7 +96,7 @@ public class TestDistributedUpgrade {
/** /**
*/ */
@Test(timeout=120000) @Test(timeout=300000) // 5 min timeout
public void testDistributedUpgrade() throws Exception { public void testDistributedUpgrade() throws Exception {
int numDirs = 1; int numDirs = 1;
TestDFSUpgradeFromImage testImg = new TestDFSUpgradeFromImage(); TestDFSUpgradeFromImage testImg = new TestDFSUpgradeFromImage();