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

HBASE-25910 - Fix port assignment test (#3308) 

Signed-off-by: David Manning <david.manning@salesforce.com>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
Victor 2021-05-28 08:22:07 -07:00 committed by Viraj Jasani
parent a1cac20e95
commit 5aa39a975c
No known key found for this signature in database
GPG Key ID: 08E70F70AB71C5A1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -2256,6 +2256,7 @@ public class HRegionServer extends Thread implements
// auto bind enabled, try to use another port // auto bind enabled, try to use another port
LOG.info("Failed binding http info server to port: " + port); LOG.info("Failed binding http info server to port: " + port);
port++; port++;
LOG.info("Retry starting http info server with port: " + port);
} }
} }
port = this.infoServer.getPort(); port = this.infoServer.getPort();

17
hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
View File

@ -19,7 +19,9 @@ package org.apache.hadoop.hbase;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.net.BindException; import java.net.BindException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
@ -27,7 +29,6 @@ import org.junit.experimental.categories.Category;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@org.junit.Ignore // See HBASE-24342. This test can't pass 100% of time as written so disabling
@Category(MediumTests.class) @Category(MediumTests.class)
public class TestClusterPortAssignment { public class TestClusterPortAssignment {
@ClassRule @ClassRule
@ -41,7 +42,7 @@ public class TestClusterPortAssignment {
* Check that we can start an HBase cluster specifying a custom set of * Check that we can start an HBase cluster specifying a custom set of
* RPC and infoserver ports. * RPC and infoserver ports.
*/ */
@Test @Test(timeout = 300000)
public void testClusterPortAssignment() throws Exception { public void testClusterPortAssignment() throws Exception {
boolean retry = false; boolean retry = false;
do { do {
@ -50,10 +51,13 @@ public class TestClusterPortAssignment {
int rsPort = HBaseTestingUtility.randomFreePort(); int rsPort = HBaseTestingUtility.randomFreePort();
int rsInfoPort = HBaseTestingUtility.randomFreePort(); int rsInfoPort = HBaseTestingUtility.randomFreePort();
TEST_UTIL.getConfiguration().setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false); TEST_UTIL.getConfiguration().setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false);
TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, false);
TEST_UTIL.getConfiguration().setBoolean("fs.hdfs.impl.disable.cache", true);
TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_PORT, masterPort); TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_PORT, masterPort);
TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, masterInfoPort); TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, masterInfoPort);
TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_PORT, rsPort); TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_PORT, rsPort);
TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, rsInfoPort); TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, rsInfoPort);
LOG.info("Ports: {}, {}, {}, {}", masterPort, masterInfoPort, rsPort, rsInfoPort);
try { try {
MiniHBaseCluster cluster = TEST_UTIL.startMiniCluster(); MiniHBaseCluster cluster = TEST_UTIL.startMiniCluster();
assertTrue("Cluster failed to come up", cluster.waitForActiveAndReadyMaster(30000)); assertTrue("Cluster failed to come up", cluster.waitForActiveAndReadyMaster(30000));
@ -67,13 +71,14 @@ public class TestClusterPortAssignment {
assertEquals("RS info port is incorrect", rsInfoPort, assertEquals("RS info port is incorrect", rsInfoPort,
cluster.getRegionServer(0).getInfoServer().getPort()); cluster.getRegionServer(0).getInfoServer().getPort());
} catch (Exception e) { } catch (Exception e) {
if (e instanceof BindException || e.getCause() != null && Throwable rootCause = ExceptionUtils.getRootCause(e);
(e.getCause() instanceof BindException || e.getCause().getCause() != null && if (rootCause instanceof BindException) {
e.getCause().getCause() instanceof BindException)) {
LOG.info("Failed bind, need to retry", e); LOG.info("Failed bind, need to retry", e);
retry = true; retry = true;
} else { } else {
throw e; LOG.error("Failed to start mini cluster", e);
retry = false;
fail("Failed to start mini cluster with assigned ports.");
} }
} finally { } finally {
TEST_UTIL.shutdownMiniCluster(); TEST_UTIL.shutdownMiniCluster();