diff --git pom.xml pom.xml
index 6d4cb89..729dc37 100644
--- pom.xml
+++ pom.xml
@@ -630,7 +630,7 @@
1.4
1.6.0
1.1.1
- 4.8.1
+ 4.8.2
1.2.16
1.8.5
2.3.0
diff --git src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
index 19cae25..76729ba 100644
--- src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
+++ src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
@@ -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);
diff --git src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
index 9d9ad9e..62bf564 100644
--- src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
+++ src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
@@ -98,7 +98,7 @@ public class TestSplitTransactionOnCluster {
* @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 TestSplitTransactionOnCluster {
}
}
- @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 TestSplitTransactionOnCluster {
* @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 TestSplitTransactionOnCluster {
* @throws IOException
* @throws InterruptedException
*/
- @Test public void testShutdownFixupWhenDaughterHasSplit()
+ @Test (timeout=300000) public void testShutdownFixupWhenDaughterHasSplit()
throws IOException, InterruptedException {
final byte [] tableName =
Bytes.toBytes("testShutdownFixupWhenDaughterHasSplit");