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

HDFS-4810. several HDFS HA tests have timeouts that are too short. Contributed by Chris Nauroth. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1480841 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2013-05-10 00:16:18 +00:00
parent 742707d621
commit 7e5b63af13
3 changed files with 7 additions and 4 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

@ -975,6 +975,9 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4784. NPE in FSDirectory.resolvePath(). (Brandon Li via suresh) HDFS-4784. NPE in FSDirectory.resolvePath(). (Brandon Li via suresh)
HDFS-4810. several HDFS HA tests have timeouts that are too short. (Chris
Nauroth via atm)
Release 2.0.4-alpha - 2013-04-25 Release 2.0.4-alpha - 2013-04-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -121,7 +121,7 @@ public class TestDFSZKFailoverController extends ClientBaseWithFixes {
* Test that automatic failover is triggered by shutting the * Test that automatic failover is triggered by shutting the
* active NN down. * active NN down.
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testFailoverAndBackOnNNShutdown() throws Exception { public void testFailoverAndBackOnNNShutdown() throws Exception {
Path p1 = new Path("/dir1"); Path p1 = new Path("/dir1");
Path p2 = new Path("/dir2"); Path p2 = new Path("/dir2");
@ -191,7 +191,7 @@ public class TestDFSZKFailoverController extends ClientBaseWithFixes {
return false; return false;
} }
} }
}, 50, 5000); }, 50, 15000);
} }
/** /**

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

@ -245,7 +245,7 @@ public class TestStandbyCheckpoints {
* checkpoint is in progress on the SBN, and therefore the StandbyCheckpointer * checkpoint is in progress on the SBN, and therefore the StandbyCheckpointer
* thread will have FSNS lock. Regression test for HDFS-4591. * thread will have FSNS lock. Regression test for HDFS-4591.
*/ */
@Test(timeout=120000) @Test(timeout=300000)
public void testStandbyExceptionThrownDuringCheckpoint() throws Exception { public void testStandbyExceptionThrownDuringCheckpoint() throws Exception {
// Set it up so that we know when the SBN checkpoint starts and ends. // Set it up so that we know when the SBN checkpoint starts and ends.
@ -256,7 +256,7 @@ public class TestStandbyCheckpoints {
Mockito.any(Canceler.class)); Mockito.any(Canceler.class));
// Perform some edits and wait for a checkpoint to start on the SBN. // Perform some edits and wait for a checkpoint to start on the SBN.
doEdits(0, 2000); doEdits(0, 1000);
nn0.getRpcServer().rollEditLog(); nn0.getRpcServer().rollEditLog();
answerer.waitForCall(); answerer.waitForCall();
answerer.proceed(); answerer.proceed();