diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MasterRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MasterRegistry.java index 76477aac877..af6eaa5e387 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MasterRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MasterRegistry.java @@ -49,8 +49,9 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetMaste * {@link #MASTER_REGISTRY_HEDGED_REQS_FANOUT_KEY} to a value greater than {@code 1} will enable * it(the default value is {@link AbstractRpcBasedConnectionRegistry#HEDGED_REQS_FANOUT_DEFAULT}). *

- * TODO: Handle changes to the configuration dynamically without having to restart the client. + * @deprecated Since 2.5.0, will be removed in 4.0.0. Use {@link RpcConnectionRegistry} instead. */ +@Deprecated @InterfaceAudience.Private public class MasterRegistry extends AbstractRpcBasedConnectionRegistry { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegistryEndpointsRefresher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegistryEndpointsRefresher.java index 7eb81b0883f..6599b620eb2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegistryEndpointsRefresher.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegistryEndpointsRefresher.java @@ -39,12 +39,8 @@ class RegistryEndpointsRefresher { private static final Logger LOG = LoggerFactory.getLogger(RegistryEndpointsRefresher.class); - public static final String PERIODIC_REFRESH_INTERVAL_SECS = - "hbase.client.rpc_registry.refresh_interval_secs"; private static final int PERIODIC_REFRESH_INTERVAL_SECS_DEFAULT = 300; - public static final String MIN_SECS_BETWEEN_REFRESHES = - "hbase.client.rpc_registry.min_secs_between_refreshes"; private static final int MIN_SECS_BETWEEN_REFRESHES_DEFAULT = 60; private final Thread thread; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistry.java index 0096bfc0171..bcd37b182b6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistry.java @@ -49,7 +49,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetBoots public class RpcConnectionRegistry extends AbstractRpcBasedConnectionRegistry { /** Configuration key that controls the fan out of requests **/ - public static final String HEDGED_REQS_FANOUT_KEY = "hbase.client.rpc_registry.hedged.fanout"; + public static final String HEDGED_REQS_FANOUT_KEY = "hbase.client.bootstrap.hedged.fanout"; public static final String PERIODIC_REFRESH_INTERVAL_SECS = "hbase.client.bootstrap.refresh_interval_secs"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java similarity index 87% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java rename to hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java index 1447099168f..748ad41952a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestRegistryEndpointsRefresher.java @@ -52,13 +52,13 @@ public class TestRegistryEndpointsRefresher { private Configuration conf; private RegistryEndpointsRefresher refresher; - private AtomicInteger getMastersCallCounter; + private AtomicInteger refreshCallCounter; private CopyOnWriteArrayList callTimestamps; @Before public void setUp() { conf = HBaseConfiguration.create(); - getMastersCallCounter = new AtomicInteger(0); + refreshCallCounter = new AtomicInteger(0); callTimestamps = new CopyOnWriteArrayList<>(); } @@ -70,7 +70,7 @@ public class TestRegistryEndpointsRefresher { } private void refresh() { - getMastersCallCounter.incrementAndGet(); + refreshCallCounter.incrementAndGet(); callTimestamps.add(EnvironmentEdgeManager.currentTime()); } @@ -86,8 +86,8 @@ public class TestRegistryEndpointsRefresher { public void testPeriodicMasterEndPointRefresh() throws IOException { // Refresh every 1 second. createAndStartRefresher(1, 0); - // Wait for > 3 seconds to see that at least 3 getMasters() RPCs have been made. - Waiter.waitFor(conf, 5000, () -> getMastersCallCounter.get() > 3); + // Wait for > 3 seconds to see that at least 3 refresh have been made. + Waiter.waitFor(conf, 5000, () -> refreshCallCounter.get() > 3); } @Test @@ -101,10 +101,10 @@ public class TestRegistryEndpointsRefresher { Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MILLISECONDS); } // Overall wait time is 10000 ms, so the number of requests should be <=10 - // Actual calls to getMasters() should be much lower than the refresh count. - assertTrue(String.valueOf(getMastersCallCounter.get()), getMastersCallCounter.get() <= 20); + // Actual calls to refresh should be much lower than the refresh count. + assertTrue(String.valueOf(refreshCallCounter.get()), refreshCallCounter.get() <= 20); assertTrue(callTimestamps.size() > 0); - // Verify that the delta between subsequent RPCs is at least 1sec as configured. + // Verify that the delta between subsequent refresh is at least 1sec as configured. for (int i = 1; i < callTimestamps.size() - 1; i++) { long delta = callTimestamps.get(i) - callTimestamps.get(i - 1); // Few ms cushion to account for any env jitter. diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index c2ed0b6b31a..db6cb860073 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -2700,10 +2700,21 @@ public class HMaster extends HRegionServer implements MasterServices { return status; } - List getBackupMasters() { + @Override + public Optional getActiveMaster() { + return activeMasterManager.getActiveMasterServerName(); + } + + @Override + public List getBackupMasters() { return activeMasterManager.getBackupMasters(); } + @Override + public List getRegionServers() { + return serverManager.getOnlineServersList(); + } + /** * The set of loaded coprocessors is stored in a static set. Since it's * statically allocated, it does not require that HMaster's cpHost be @@ -3848,10 +3859,6 @@ public class HMaster extends HRegionServer implements MasterServices { return cachedClusterId.getFromCacheOrFetch(); } - public Optional getActiveMaster() { - return activeMasterManager.getActiveMasterServerName(); - } - @Override public void runReplicationBarrierCleaner() { ReplicationBarrierCleaner rbc = this.replicationBarrierCleaner; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java index 9a55d1db935..2a26fa0c644 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java @@ -33,7 +33,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import org.apache.hadoop.conf.Configuration; @@ -372,15 +371,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProto import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.ReportRegionStateTransitionResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.ClientMetaService; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetActiveMasterRequest; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetActiveMasterResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetBootstrapNodesRequest; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetBootstrapNodesResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetClusterIdRequest; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetClusterIdResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetMastersRequest; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetMastersResponse; -import org.apache.hadoop.hbase.shaded.protobuf.generated.RegistryProtos.GetMastersResponseEntry; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerRequest; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.AddReplicationPeerResponse; import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.DisableReplicationPeerRequest; @@ -408,8 +398,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.VisibilityLabelsProtos. @SuppressWarnings("deprecation") public class MasterRpcServices extends RSRpcServices implements MasterService.BlockingInterface, RegionServerStatusService.BlockingInterface, - LockService.BlockingInterface, HbckService.BlockingInterface, - ClientMetaService.BlockingInterface { + LockService.BlockingInterface, HbckService.BlockingInterface { private static final Logger LOG = LoggerFactory.getLogger(MasterRpcServices.class.getName()); private static final Logger AUDITLOG = @@ -3003,58 +2992,6 @@ public class MasterRpcServices extends RSRpcServices implements return true; } - // Override this method since for backup master we will not set the clusterId field, which means - // we need to find another way to get cluster id for backup masters. - @Override - public GetClusterIdResponse getClusterId(RpcController rpcController, GetClusterIdRequest request) - throws ServiceException { - GetClusterIdResponse.Builder resp = GetClusterIdResponse.newBuilder(); - String clusterId = master.getClusterId(); - if (clusterId != null) { - resp.setClusterId(clusterId); - } - return resp.build(); - } - - // Override this method since we use ActiveMasterManager to get active master on HMaster while in - // HRegionServer we use MasterAddressTracker - @Override - public GetActiveMasterResponse getActiveMaster(RpcController rpcController, - GetActiveMasterRequest request) throws ServiceException { - GetActiveMasterResponse.Builder resp = GetActiveMasterResponse.newBuilder(); - Optional serverName = master.getActiveMaster(); - serverName.ifPresent(name -> resp.setServerName(ProtobufUtil.toServerName(name))); - return resp.build(); - } - - // Override this method since we use ActiveMasterManager to get backup masters on HMaster while in - // HRegionServer we use MasterAddressTracker - @Override - public GetMastersResponse getMasters(RpcController rpcController, GetMastersRequest request) - throws ServiceException { - GetMastersResponse.Builder resp = GetMastersResponse.newBuilder(); - // Active master - Optional serverName = master.getActiveMaster(); - serverName.ifPresent(name -> resp.addMasterServers(GetMastersResponseEntry.newBuilder() - .setServerName(ProtobufUtil.toServerName(name)).setIsActive(true).build())); - // Backup masters - for (ServerName backupMaster : master.getBackupMasters()) { - resp.addMasterServers(GetMastersResponseEntry.newBuilder() - .setServerName(ProtobufUtil.toServerName(backupMaster)).setIsActive(false).build()); - } - return resp.build(); - } - - @Override - public GetBootstrapNodesResponse getBootstrapNodes(RpcController controller, - GetBootstrapNodesRequest request) throws ServiceException { - GetBootstrapNodesResponse.Builder builder = GetBootstrapNodesResponse.newBuilder(); - for (ServerName sn : master.getServerManager().getOnlineServers().keySet()) { - builder.addServerName(ProtobufUtil.toServerName(sn)); - } - return builder.build(); - } - @Override public GetRSGroupInfoResponse getRSGroupInfo(RpcController controller, GetRSGroupInfoRequest request) throws ServiceException { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index d8a43d5279d..90edff2bb90 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -4007,11 +4007,19 @@ public class HRegionServer extends Thread implements return this.retryPauseTime; } + public Optional getActiveMaster() { + return Optional.ofNullable(masterAddressTracker.getMasterAddress()); + } + + public List getBackupMasters() { + return masterAddressTracker.getBackupMasters(); + } + + public List getRegionServers() { + return regionServerAddressTracker.getRegionServers(); + } + public MetaRegionLocationCache getMetaRegionLocationCache() { return this.metaRegionLocationCache; } - - RegionServerAddressTracker getRegionServerAddressTracker() { - return regionServerAddressTracker; - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 56c53714bc4..9a2394a26c4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -308,14 +308,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, */ private static final long DEFAULT_REGION_SERVER_RPC_MINIMUM_SCAN_TIME_LIMIT_DELTA = 10; - /* + /** * Whether to reject rows with size > threshold defined by * {@link RSRpcServices#BATCH_ROWS_THRESHOLD_NAME} */ private static final String REJECT_BATCH_ROWS_OVER_THRESHOLD = "hbase.rpc.rows.size.threshold.reject"; - /* + /** * Default value of config {@link RSRpcServices#REJECT_BATCH_ROWS_OVER_THRESHOLD} */ private static final boolean DEFAULT_REJECT_BATCH_ROWS_OVER_THRESHOLD = false; @@ -4092,31 +4092,22 @@ public class RSRpcServices implements HBaseRPCErrorHandler, public GetActiveMasterResponse getActiveMaster(RpcController controller, GetActiveMasterRequest request) throws ServiceException { GetActiveMasterResponse.Builder builder = GetActiveMasterResponse.newBuilder(); - ServerName activeMaster = regionServer.getMasterAddressTracker().getMasterAddress(); - if (activeMaster != null) { - builder.setServerName(ProtobufUtil.toServerName(activeMaster)); - } + regionServer.getActiveMaster() + .ifPresent(name -> builder.setServerName(ProtobufUtil.toServerName(name))); return builder.build(); } @Override public GetMastersResponse getMasters(RpcController controller, GetMastersRequest request) throws ServiceException { - try { - GetMastersResponse.Builder builder = GetMastersResponse.newBuilder(); - ServerName activeMaster = regionServer.getMasterAddressTracker().getMasterAddress(); - if (activeMaster != null) { - builder.addMasterServers(GetMastersResponseEntry.newBuilder() - .setServerName(ProtobufUtil.toServerName(activeMaster)).setIsActive(true)); - } - for (ServerName backupMaster : regionServer.getMasterAddressTracker().getBackupMasters()) { - builder.addMasterServers(GetMastersResponseEntry.newBuilder() - .setServerName(ProtobufUtil.toServerName(backupMaster)).setIsActive(false)); - } - return builder.build(); - } catch (IOException e) { - throw new ServiceException(e); - } + GetMastersResponse.Builder builder = GetMastersResponse.newBuilder(); + regionServer.getActiveMaster() + .ifPresent(activeMaster -> builder.addMasterServers(GetMastersResponseEntry.newBuilder() + .setServerName(ProtobufUtil.toServerName(activeMaster)).setIsActive(true))); + regionServer.getBackupMasters() + .forEach(backupMaster -> builder.addMasterServers(GetMastersResponseEntry.newBuilder() + .setServerName(ProtobufUtil.toServerName(backupMaster)).setIsActive(false))); + return builder.build(); } @Override @@ -4131,11 +4122,11 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } @Override - public GetBootstrapNodesResponse getBootstrapNodes(RpcController controller, + public final GetBootstrapNodesResponse getBootstrapNodes(RpcController controller, GetBootstrapNodesRequest request) throws ServiceException { GetBootstrapNodesResponse.Builder builder = GetBootstrapNodesResponse.newBuilder(); - regionServer.getRegionServerAddressTracker().getRegionServers().stream() - .map(ProtobufUtil::toServerName).forEach(builder::addServerName); + regionServer.getRegionServers().stream().map(ProtobufUtil::toServerName) + .forEach(builder::addServerName); return builder.build(); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.java index 611951565ea..22ba74c30ad 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitRegionWhileRSCrash.java @@ -18,14 +18,12 @@ package org.apache.hadoop.hbase.master; import java.util.List; -import java.util.concurrent.CountDownLatch; import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseTestingUtil; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionInfo; -import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; @@ -45,53 +43,50 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hbase.thirdparty.com.google.common.io.Closeables; + @Category({MasterTests.class, MediumTests.class}) public class TestSplitRegionWhileRSCrash { @ClassRule public static final HBaseClassTestRule CLASS_RULE = - HBaseClassTestRule.forClass(TestSplitRegionWhileRSCrash.class); + HBaseClassTestRule.forClass(TestSplitRegionWhileRSCrash.class); - private static final Logger LOG = LoggerFactory - .getLogger(TestSplitRegionWhileRSCrash.class); + private static final Logger LOG = LoggerFactory.getLogger(TestSplitRegionWhileRSCrash.class); protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil(); private static TableName TABLE_NAME = TableName.valueOf("test"); - private static Admin admin; + private static Admin ADMIN; private static byte[] CF = Bytes.toBytes("cf"); - private static CountDownLatch mergeCommitArrive = new CountDownLatch(1); private static Table TABLE; @BeforeClass public static void setupCluster() throws Exception { UTIL.startMiniCluster(1); - admin = UTIL.getAdmin(); + ADMIN = UTIL.getAdmin(); TABLE = UTIL.createTable(TABLE_NAME, CF); UTIL.waitTableAvailable(TABLE_NAME); } @AfterClass public static void cleanupTest() throws Exception { - try { - UTIL.shutdownMiniCluster(); - } catch (Exception e) { - LOG.warn("failure shutting down cluster", e); - } + Closeables.close(TABLE, true); + UTIL.shutdownMiniCluster(); } @Test public void test() throws Exception { - MasterProcedureEnv env = UTIL.getMiniHBaseCluster().getMaster() - .getMasterProcedureExecutor().getEnvironment(); - final ProcedureExecutor executor = UTIL.getMiniHBaseCluster() - .getMaster().getMasterProcedureExecutor(); - List regionInfos = admin.getRegions(TABLE_NAME); - //Since a flush request will be sent while initializing SplitTableRegionProcedure - //Create SplitTableRegionProcedure first before put data - SplitTableRegionProcedure splitProcedure = new SplitTableRegionProcedure( - env, regionInfos.get(0), Bytes.toBytes("row5")); - //write some rows to the table + MasterProcedureEnv env = + UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor().getEnvironment(); + final ProcedureExecutor executor = + UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor(); + List regionInfos = ADMIN.getRegions(TABLE_NAME); + // Since a flush request will be sent while initializing SplitTableRegionProcedure + // Create SplitTableRegionProcedure first before put data + SplitTableRegionProcedure splitProcedure = + new SplitTableRegionProcedure(env, regionInfos.get(0), Bytes.toBytes("row5")); + // write some rows to the table LOG.info("Begin to put data"); for (int i = 0; i < 10; i++) { byte[] row = Bytes.toBytes("row" + i); @@ -101,19 +96,18 @@ public class TestSplitRegionWhileRSCrash { } executor.submitProcedure(splitProcedure); LOG.info("SplitProcedure submitted"); - UTIL.waitFor(30000, () -> executor.getProcedures().stream() - .filter(p -> p instanceof TransitRegionStateProcedure) + UTIL.waitFor(30000, + () -> executor.getProcedures().stream().filter(p -> p instanceof TransitRegionStateProcedure) .map(p -> (TransitRegionStateProcedure) p) .anyMatch(p -> TABLE_NAME.equals(p.getTableName()))); - UTIL.getMiniHBaseCluster().killRegionServer( - UTIL.getMiniHBaseCluster().getRegionServer(0).getServerName()); + UTIL.getMiniHBaseCluster() + .killRegionServer(UTIL.getMiniHBaseCluster().getRegionServer(0).getServerName()); UTIL.getMiniHBaseCluster().startRegionServer(); UTIL.waitUntilNoRegionsInTransition(); Scan scan = new Scan(); ResultScanner results = TABLE.getScanner(scan); int count = 0; - Result result = null; - while ((result = results.next()) != null) { + while (results.next() != null) { count++; } Assert.assertEquals("There should be 10 rows!", 10, count); diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java index 748fb8b141b..54385f81f75 100644 --- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java +++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java @@ -307,7 +307,7 @@ public class MasterAddressTracker extends ZKNodeTracker { return false; } - public List getBackupMasters() throws InterruptedIOException { + public List getBackupMasters() { return backupMasters; }