hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject hbase git commit: HBASE-13317 Region server reportForDuty stuck looping if there is a master change - ADDENDUM for branch-1 (Jerry He)
Date Thu, 02 Apr 2015 00:24:31 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 cada6fd87 -> 029bd7651


HBASE-13317 Region server reportForDuty stuck looping if there is a master change - ADDENDUM
for branch-1 (Jerry He)


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

Branch: refs/heads/branch-1.0
Commit: 029bd765178f39d5c6766fb63fb9c4b6b99d8501
Parents: cada6fd
Author: Enis Soztutar <enis@apache.org>
Authored: Wed Apr 1 17:22:48 2015 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Wed Apr 1 17:24:15 2015 -0700

----------------------------------------------------------------------
 .../regionserver/TestRegionServerReportForDuty.java      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/029bd765/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
index ebb8209..28e2c17 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
@@ -83,9 +83,8 @@ public class TestRegionServerReportForDuty {
     // Start a master and wait for it to become the active/primary master.
     // Use a random unique port
     cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort());
-    // master has a rs. defaultMinToStart = 2
-    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2);
-    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 2);
+    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 1);
+    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 1);
     master = cluster.addMaster();
     rs = cluster.addRegionServer();
     LOG.debug("Starting master: " + master.getMaster().getServerName());
@@ -109,8 +108,8 @@ public class TestRegionServerReportForDuty {
     // Start a new master and use another random unique port
     // Also let it wait for exactly 2 region severs to report in.
     cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort());
-    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 3);
-    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 3);
+    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2);
+    cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 2);
     backupMaster = cluster.addMaster();
     LOG.debug("Starting new master: " + backupMaster.getMaster().getServerName());
     backupMaster.start();
@@ -120,7 +119,7 @@ public class TestRegionServerReportForDuty {
     // Do some checking/asserts here.
     assertTrue(backupMaster.getMaster().isActiveMaster());
     assertTrue(backupMaster.getMaster().isInitialized());
-    assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(),
3);
+    assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(),
2);
 
   }
 


Mime
View raw message