You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2019/11/21 17:44:03 UTC
[hbase] branch branch-2 updated: HBASE-23259: Populate master
address end points in cluster/rs configs (#807) (#857)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new d742112 HBASE-23259: Populate master address end points in cluster/rs configs (#807) (#857)
d742112 is described below
commit d742112ed9b214d22245637cf6d9c9edcefabb66
Author: Nick Dimiduk <nd...@apache.org>
AuthorDate: Thu Nov 21 09:43:53 2019 -0800
HBASE-23259: Populate master address end points in cluster/rs configs (#807) (#857)
All the clients need to know the master RPC end points while using master
based registry for creating cluster connections. This patch amends the
test cluster utility to populate these configs in the base configuration
object used to spin up the cluster.
The config key added here ("hbase.master.addrs") is used in the subsequent
patches for HBASE-18095.
Signed-off-by: Nick Dimiduk <nd...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 5 +++++
.../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 10 +++++++++-
.../org/apache/hadoop/hbase/TestHBaseTestingUtility.java | 12 ++++++++++--
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 53b3de7..a1cf8cc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -176,6 +176,11 @@ public final class HConstants {
/** Configuration key for master web API port */
public static final String MASTER_INFO_PORT = "hbase.master.info.port";
+ /** Configuration key for the list of master host:ports **/
+ public static final String MASTER_ADDRS_KEY = "hbase.master.addrs";
+
+ public static final String MASTER_ADDRS_DEFAULT = "localhost:" + DEFAULT_MASTER_PORT;
+
/** Parameter name for the master type being backup (waits for primary to go inactive). */
public static final String MASTER_TYPE_BACKUP = "hbase.master.backup";
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
index 1914393..df0b498 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java
@@ -173,6 +173,14 @@ public class LocalHBaseCluster {
for (int i = 0; i < noMasters; i++) {
addMaster(new Configuration(conf), i);
}
+
+ // Populate the master address host ports in the config. This is needed if a master based
+ // registry is configured for client metadata services (HBASE-18095)
+ List<String> masterHostPorts = new ArrayList<>();
+ getMasters().forEach(masterThread ->
+ masterHostPorts.add(masterThread.getMaster().getServerName().getAddress().toString()));
+ conf.set(HConstants.MASTER_ADDRS_KEY, String.join(",", masterHostPorts));
+
// Start the HRegionServers.
this.regionServerClass =
(Class<? extends HRegionServer>)conf.getClass(HConstants.REGION_SERVER_IMPL,
@@ -220,7 +228,7 @@ public class LocalHBaseCluster {
}
public JVMClusterUtil.MasterThread addMaster(Configuration c, final int index)
- throws IOException {
+ throws IOException {
// Create each master with its own Configuration instance so each has
// its Connection instance rather than share (see HBASE_INSTANCES down in
// the guts of ConnectionManager.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
index 76a2370..b2a616a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -447,10 +447,14 @@ public class TestHBaseTestingUtility {
HBaseTestingUtility htu = new HBaseTestingUtility(defaultConfig);
try {
MiniHBaseCluster defaultCluster = htu.startMiniCluster();
+ final String masterHostPort =
+ defaultCluster.getMaster().getServerName().getAddress().toString();
assertNotEquals(HConstants.DEFAULT_MASTER_INFOPORT,
defaultCluster.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));
assertNotEquals(HConstants.DEFAULT_REGIONSERVER_INFOPORT,
defaultCluster.getConfiguration().getInt(HConstants.REGIONSERVER_INFO_PORT, 0));
+ assertEquals(masterHostPort,
+ defaultCluster.getConfiguration().get(HConstants.MASTER_ADDRS_KEY));
} finally {
htu.shutdownMiniCluster();
}
@@ -464,10 +468,14 @@ public class TestHBaseTestingUtility {
htu = new HBaseTestingUtility(altConfig);
try {
MiniHBaseCluster customCluster = htu.startMiniCluster();
+ final String masterHostPort =
+ customCluster.getMaster().getServerName().getAddress().toString();
assertEquals(nonDefaultMasterInfoPort,
- customCluster.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));
+ customCluster.getConfiguration().getInt(HConstants.MASTER_INFO_PORT, 0));
assertEquals(nonDefaultRegionServerPort,
customCluster.getConfiguration().getInt(HConstants.REGIONSERVER_INFO_PORT, 0));
+ assertEquals(masterHostPort,
+ customCluster.getConfiguration().get(HConstants.MASTER_ADDRS_KEY));
} finally {
htu.shutdownMiniCluster();
}