hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-12666 TestAssignmentManager hanging; add timeouts
Date Tue, 16 Dec 2014 01:03:34 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 3bd374cf0 -> a16c01c51


HBASE-12666 TestAssignmentManager hanging; add timeouts


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a16c01c5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a16c01c5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a16c01c5

Branch: refs/heads/0.98
Commit: a16c01c513150ce53a6cdbf2afe03b2b65b41df1
Parents: 3bd374c
Author: stack <stack@apache.org>
Authored: Tue Dec 9 20:45:02 2014 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Mon Dec 15 17:03:10 2014 -0800

----------------------------------------------------------------------
 .../hbase/master/TestAssignmentManager.java     | 26 ++++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a16c01c5/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index 2076c07..604e121 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -359,7 +359,7 @@ public class TestAssignmentManager {
    * @throws KeeperException
    * @throws DeserializationException
    */
-  @Test
+  @Test (timeout=180000)
   public void testBalance()
     throws IOException, KeeperException, DeserializationException, InterruptedException {
     // Create and startup an executor.  This is used by AssignmentManager
@@ -434,7 +434,7 @@ public class TestAssignmentManager {
    * @throws KeeperException
    * @throws IOException
    */
-  @Test
+  @Test (timeout=180000)
   public void testShutdownHandler()
       throws KeeperException, IOException, ServiceException {
     // Create and startup an executor.  This is used by AssignmentManager
@@ -465,7 +465,7 @@ public class TestAssignmentManager {
    * @throws IOException
    * @throws ServiceException
    */
-  @Test
+  @Test (timeout=180000)
   public void testSSHWhenDisableTableInProgress() throws KeeperException, IOException,
       ServiceException {
     testCaseWithPartiallyDisabledState(Table.State.DISABLING);
@@ -480,7 +480,7 @@ public class TestAssignmentManager {
    * @throws KeeperException
    * @throws IOException
    */
-  @Test
+  @Test (timeout=180000)
   public void testSSHWhenSplitRegionInProgress() throws KeeperException, IOException, Exception
{
     // true indicates the region is split but still in RIT
     testCaseWithSplitRegionPartial(true);
@@ -672,7 +672,7 @@ public class TestAssignmentManager {
     return executor;
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testUnassignWithSplitAtSameTime() throws KeeperException, IOException {
     // Region to use in test.
     final HRegionInfo hri = HRegionInfo.FIRST_META_REGIONINFO;
@@ -927,7 +927,7 @@ public class TestAssignmentManager {
    * @throws IOException
    * @throws Exception
    */
-  @Test
+  @Test (timeout=180000)
   public void testMasterRestartWhenTableInEnabling() throws KeeperException, IOException,
Exception {
     enabling = true;
     List<ServerName> destServers = new ArrayList<ServerName>(1);
@@ -964,7 +964,7 @@ public class TestAssignmentManager {
    * @throws IOException
    * @throws Exception
    */
-  @Test
+  @Test (timeout=180000)
   public void testMasterRestartShouldRemoveStaleZnodesOfUnknownTableAsForMeta()
       throws KeeperException, IOException, Exception {
     List<ServerName> destServers = new ArrayList<ServerName>(1);
@@ -991,7 +991,7 @@ public class TestAssignmentManager {
    * the region assignment takes a long time normally (waiting for timeout monitor to trigger
assign).
    * This test is to make sure SSH reassigns it right away.
    */
-  @Test
+  @Test (timeout=180000)
   public void testSSHTimesOutOpeningRegionTransition()
       throws KeeperException, IOException, ServiceException {
     // We need a mocked catalog tracker.
@@ -1028,7 +1028,7 @@ public class TestAssignmentManager {
    *  <li> the master must handle this nicely and reassign.
    *  </ul>
    */
-  @Test
+  @Test (timeout=180000)
   public void testClosingFailureDuringRecovery() throws Exception {
 
     AssignmentManagerWithExtrasForTesting am =
@@ -1274,7 +1274,7 @@ public class TestAssignmentManager {
     while (!t.isAlive()) Threads.sleep(1);
   }
 
-  @Test
+  @Test (timeout=180000)
   public void testForceAssignMergingRegion() throws Exception {
     // Region to use in test.
     final HRegionInfo hri = HRegionInfo.FIRST_META_REGIONINFO;
@@ -1308,7 +1308,7 @@ public class TestAssignmentManager {
    * if ZK is used during the assignment action (only hbck doesn't use ZK for region
    * assignment). So during master failover, we can ignored such events too.
    */
-  @Test
+  @Test (timeout=180000)
   public void testAssignmentEventIgnoredIfNotExpected() throws KeeperException, IOException
{
     // Region to use in test.
     final HRegionInfo hri = HRegionInfo.FIRST_META_REGIONINFO;
@@ -1357,7 +1357,7 @@ public class TestAssignmentManager {
    * Otherwise, the region will be brought back.
    * @throws Exception
    */
-  @Test
+  @Test (timeout=180000)
   public void testBalanceRegionOfDeletedTable() throws Exception {
     CatalogTracker ct = Mockito.mock(CatalogTracker.class);
     AssignmentManager am = new AssignmentManager(this.server, this.serverManager,
@@ -1379,7 +1379,7 @@ public class TestAssignmentManager {
    * for openRegion. AM should assign this somewhere else. (HBASE-9721)
    */
   @SuppressWarnings("unchecked")
-  @Test
+  @Test (timeout=180000)
   public void testOpenCloseRegionRPCIntendedForPreviousServer() throws Exception {
     Mockito.when(this.serverManager.sendRegionOpen(Mockito.eq(SERVERNAME_B), Mockito.eq(REGIONINFO),
       Mockito.anyInt(), (List<ServerName>)Mockito.any()))


Mime
View raw message