Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Enis Soztutar 2015-04-01 17:22:48 -07:00
parent a6ddcc8fa2
commit b22fcd36ef
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerReportForDuty.java
View File

@ -83,9 +83,8 @@ public class TestRegionServerReportForDuty {
// Start a master and wait for it to become the active/primary master. // Start a master and wait for it to become the active/primary master.
// Use a random unique port // Use a random unique port
cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort()); cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort());
// master has a rs. defaultMinToStart = 2 cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 1);
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2); cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 1);
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 2);
master = cluster.addMaster(); master = cluster.addMaster();
rs = cluster.addRegionServer(); rs = cluster.addRegionServer();
LOG.debug("Starting master: " + master.getMaster().getServerName()); LOG.debug("Starting master: " + master.getMaster().getServerName());
@ -109,8 +108,8 @@ public class TestRegionServerReportForDuty {
// Start a new master and use another random unique port // Start a new master and use another random unique port
// Also let it wait for exactly 2 region severs to report in. // Also let it wait for exactly 2 region severs to report in.
cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort()); cluster.getConfiguration().setInt(HConstants.MASTER_PORT, HBaseTestingUtility.randomFreePort());
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 3); cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART, 2);
cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 3); cluster.getConfiguration().setInt(ServerManager.WAIT_ON_REGIONSERVERS_MAXTOSTART, 2);
backupMaster = cluster.addMaster(); backupMaster = cluster.addMaster();
LOG.debug("Starting new master: " + backupMaster.getMaster().getServerName()); LOG.debug("Starting new master: " + backupMaster.getMaster().getServerName());
backupMaster.start(); backupMaster.start();
@ -120,7 +119,7 @@ public class TestRegionServerReportForDuty {
// Do some checking/asserts here. // Do some checking/asserts here.
assertTrue(backupMaster.getMaster().isActiveMaster()); assertTrue(backupMaster.getMaster().isActiveMaster());
assertTrue(backupMaster.getMaster().isInitialized()); assertTrue(backupMaster.getMaster().isInitialized());
assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(), 3); assertEquals(backupMaster.getMaster().getServerManager().getOnlineServersList().size(), 2);
} }