big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-4061. TestBalancer and TestUnderReplicatedBlocks need timeouts. Contributed by Eli Collins

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1399010 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-10-16 21:59:15 +00:00
parent 224de4f92c
commit e074b5816a
3 changed files with 8 additions and 7 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

@ -456,6 +456,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. (todd via eli) HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. (todd via eli)
HDFS-4061. TestBalancer and TestUnderReplicatedBlocks need timeouts. (eli)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
View File

@ -372,7 +372,7 @@ public void integrationTest(Configuration conf) throws Exception {
* Test parse method in Balancer#Cli class with threshold value out of * Test parse method in Balancer#Cli class with threshold value out of
* boundaries. * boundaries.
*/ */
@Test @Test(timeout=100000)
public void testBalancerCliParseWithThresholdOutOfBoundaries() { public void testBalancerCliParseWithThresholdOutOfBoundaries() {
String parameters[] = new String[] { "-threshold", "0" }; String parameters[] = new String[] { "-threshold", "0" };
String reason = "IllegalArgumentException is expected when threshold value" String reason = "IllegalArgumentException is expected when threshold value"
@ -394,7 +394,7 @@ public void testBalancerCliParseWithThresholdOutOfBoundaries() {
/** Test a cluster with even distribution, /** Test a cluster with even distribution,
* then a new empty node is added to the cluster*/ * then a new empty node is added to the cluster*/
@Test @Test(timeout=100000)
public void testBalancer0() throws Exception { public void testBalancer0() throws Exception {
testBalancer0Internal(new HdfsConfiguration()); testBalancer0Internal(new HdfsConfiguration());
} }
@ -406,7 +406,7 @@ void testBalancer0Internal(Configuration conf) throws Exception {
} }
/** Test unevenly distributed cluster */ /** Test unevenly distributed cluster */
@Test @Test(timeout=100000)
public void testBalancer1() throws Exception { public void testBalancer1() throws Exception {
testBalancer1Internal(new HdfsConfiguration()); testBalancer1Internal(new HdfsConfiguration());
} }
@ -419,7 +419,7 @@ void testBalancer1Internal(Configuration conf) throws Exception {
new String[] {RACK0, RACK1}); new String[] {RACK0, RACK1});
} }
@Test @Test(timeout=100000)
public void testBalancer2() throws Exception { public void testBalancer2() throws Exception {
testBalancer2Internal(new HdfsConfiguration()); testBalancer2Internal(new HdfsConfiguration());
} }
@ -467,8 +467,7 @@ private void testBalancerDefaultConstructor(Configuration conf,
/** /**
* Test parse method in Balancer#Cli class with wrong number of params * Test parse method in Balancer#Cli class with wrong number of params
*/ */
@Test(timeout=100000)
@Test
public void testBalancerCliParseWithWrongParams() { public void testBalancerCliParseWithWrongParams() {
String parameters[] = new String[] { "-threshold" }; String parameters[] = new String[] { "-threshold" };
String reason = String reason =

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestUnderReplicatedBlocks.java
View File

@ -30,7 +30,7 @@
import org.junit.Test; import org.junit.Test;
public class TestUnderReplicatedBlocks { public class TestUnderReplicatedBlocks {
@Test @Test(timeout=300000) // 5 min timeout
public void testSetrepIncWithUnderReplicatedBlocks() throws Exception { public void testSetrepIncWithUnderReplicatedBlocks() throws Exception {
Configuration conf = new HdfsConfiguration(); Configuration conf = new HdfsConfiguration();
final short REPLICATION_FACTOR = 2; final short REPLICATION_FACTOR = 2;