You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/06/27 23:47:49 UTC
svn commit: r1140339 - in /hbase/trunk: CHANGES.txt pom.xml
src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
Author: stack
Date: Mon Jun 27 21:47:49 2011
New Revision: 1140339
URL: http://svn.apache.org/viewvc?rev=1140339&view=rev
Log:
HBASE-4037 Add timeout annotations to preempt surefire killing all tests
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/pom.xml
hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1140339&r1=1140338&r2=1140339&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Jun 27 21:47:49 2011
@@ -139,6 +139,8 @@ Release 0.91.0 - Unreleased
(gaojinchao via Ted Yu)
HBASE-4035 Fix local-master-backup.sh - parameter order wrong
(Lars George via Ted Yu)
+ HBASE-4037 Add timeout annotations to preempt surefire killing
+ all tests
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1140339&r1=1140338&r2=1140339&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Mon Jun 27 21:47:49 2011
@@ -630,7 +630,7 @@
<jersey.version>1.4</jersey.version>
<jruby.version>1.6.0</jruby.version>
<jsr311.version>1.1.1</jsr311.version>
- <junit.version>4.8.1</junit.version>
+ <junit.version>4.8.2</junit.version>
<log4j.version>1.2.16</log4j.version>
<mockito-all.version>1.8.5</mockito-all.version>
<protobuf.version>2.3.0</protobuf.version>
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1140339&r1=1140338&r2=1140339&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Mon Jun 27 21:47:49 2011
@@ -105,7 +105,7 @@ public class TestDistributedLogSplitting
cluster.shutdown();
}
- @Test
+ @Test (timeout=300000)
public void testThreeRSAbort() throws Exception {
LOG.info("testThreeRSAbort");
final int NUM_REGIONS_TO_CREATE = 40;
@@ -146,7 +146,7 @@ public class TestDistributedLogSplitting
TEST_UTIL.countRows(ht));
}
- @Test(expected=OrphanHLogAfterSplitException.class)
+ @Test(expected=OrphanHLogAfterSplitException.class, timeout=300000)
public void testOrphanLogCreation() throws Exception {
LOG.info("testOrphanLogCreation");
startCluster(NUM_RS);
@@ -191,7 +191,7 @@ public class TestDistributedLogSplitting
}
}
- @Test
+ @Test (timeout=300000)
public void testRecoveredEdits() throws Exception {
LOG.info("testRecoveredEdits");
startCluster(NUM_RS);
@@ -242,7 +242,7 @@ public class TestDistributedLogSplitting
assertEquals(NUM_LOG_LINES, count);
}
- @Test
+ @Test (timeout=300000)
public void testWorkerAbort() throws Exception {
LOG.info("testWorkerAbort");
startCluster(1);
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1140339&r1=1140338&r2=1140339&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java Mon Jun 27 21:47:49 2011
@@ -98,7 +98,7 @@ public class TestSplitTransactionOnClust
* @throws NodeExistsException
* @throws KeeperException
*/
- @Test (timeout = 600000) public void testRSSplitEphemeralsDisappearButDaughtersAreOnlinedAfterShutdownHandling()
+ @Test (timeout = 300000) public void testRSSplitEphemeralsDisappearButDaughtersAreOnlinedAfterShutdownHandling()
throws IOException, InterruptedException, NodeExistsException, KeeperException {
final byte [] tableName =
Bytes.toBytes("ephemeral");
@@ -170,7 +170,7 @@ public class TestSplitTransactionOnClust
}
}
- @Test (timeout = 600000) public void testExistingZnodeBlocksSplitAndWeRollback()
+ @Test (timeout = 300000) public void testExistingZnodeBlocksSplitAndWeRollback()
throws IOException, InterruptedException, NodeExistsException, KeeperException {
final byte [] tableName =
Bytes.toBytes("testExistingZnodeBlocksSplitAndWeRollback");
@@ -230,7 +230,7 @@ public class TestSplitTransactionOnClust
* @throws IOException
* @throws InterruptedException
*/
- @Test (timeout = 600000) public void testShutdownSimpleFixup()
+ @Test (timeout = 300000) public void testShutdownSimpleFixup()
throws IOException, InterruptedException {
final byte [] tableName = Bytes.toBytes("testShutdownSimpleFixup");
@@ -289,7 +289,7 @@ public class TestSplitTransactionOnClust
* @throws IOException
* @throws InterruptedException
*/
- @Test public void testShutdownFixupWhenDaughterHasSplit()
+ @Test (timeout=300000) public void testShutdownFixupWhenDaughterHasSplit()
throws IOException, InterruptedException {
final byte [] tableName =
Bytes.toBytes("testShutdownFixupWhenDaughterHasSplit");