updated 2.6.2 patch

adwk67 · adwk67 · commit 3fa6301f52c3 · 2025-06-25T15:41:41.000+02:00
diff --git a/hbase/hbase/stackable/patches/2.6.2/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch b/hbase/hbase/stackable/patches/2.6.2/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch
@@ -1,49 +1,133 @@
-From 13bfb4c7799553ecd33f42d9f1da7338c64fa911 Mon Sep 17 00:00:00 2001
+From d8b2c245ad1ee6f79060875cc76049e97f7b459b Mon Sep 17 00:00:00 2001
 From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
 Date: Mon, 16 Jun 2025 14:44:32 +0200
 Subject: Allow overriding ipc bind port and use alternative port from listener
 
 ---
- .../apache/hadoop/hbase/master/HMaster.java   | 11 +++++--
- .../hbase/regionserver/HRegionServer.java     | 32 +++++++++++--------
- .../hbase/regionserver/RSRpcServices.java     |  4 +--
- 3 files changed, 29 insertions(+), 18 deletions(-)
+ .../org/apache/hadoop/hbase/HConstants.java   | 29 ++++++++++--
+ .../apache/hadoop/hbase/master/HMaster.java   | 20 +++++++--
+ .../hbase/regionserver/HRegionServer.java     | 45 +++++++++++++------
+ .../hbase/regionserver/RSRpcServices.java     |  8 +++-
+ 4 files changed, 80 insertions(+), 22 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 12f8bc6df0..4d892755d2 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
+@@ -194,18 +194,27 @@ public final class HConstants {
+   /** default host address */
+   public static final String DEFAULT_HOST = "0.0.0.0";
+ 
+-  /** Parameter name for port master listens on. */
++  /** Parameter name for port master advertises as listening on. */
+   public static final String MASTER_PORT = "hbase.master.port";
+ 
++  /** Parameter name for IPC address that master listens on. (Defaults to hostname.) */
++  public static final String MASTER_IPC_ADDRESS = "hbase.master.ipc.address";
++
++  /** Parameter name for IPC port that master listens on. (Defaults to MASTER_PORT.) */
++  public static final String MASTER_IPC_PORT = "hbase.master.ipc.port";
++
+   /** default port that the master listens on */
+   public static final int DEFAULT_MASTER_PORT = 16000;
+ 
+   /** default port for master web api */
+   public static final int DEFAULT_MASTER_INFOPORT = 16010;
+ 
+-  /** Configuration key for master web API port */
++  /** Configuration key for advertised master web API port */
+   public static final String MASTER_INFO_PORT = "hbase.master.info.port";
+ 
++  /** Configuration key for bound master web API port. (Defaults to MASTER_INFO_PORT.) */
++  public static final String MASTER_BOUND_INFO_PORT = "hbase.master.bound.info.port";
++
+   /** Configuration key for the list of master host:ports **/
+   public static final String MASTER_ADDRS_KEY = "hbase.masters";
+ 
+@@ -313,18 +322,27 @@ public final class HConstants {
+   /** Default value for ZooKeeper session timeout */
+   public static final int DEFAULT_ZK_SESSION_TIMEOUT = 90 * 1000;
+ 
+-  /** Parameter name for port region server listens on. */
++  /** Parameter name for port region server advertises as listening on. */
+   public static final String REGIONSERVER_PORT = "hbase.regionserver.port";
+ 
++  /** Parameter name for IPC address that region server listens on. (Defaults to hostname.) */
++  public static final String REGIONSERVER_IPC_ADDRESS = "hbase.regionserver.ipc.address";
++
++  /** Parameter name for IPC port that region server listens on. (Defaults to REGIONSERVER_PORT.) */
++  public static final String REGIONSERVER_IPC_PORT = "hbase.regionserver.ipc.port";
++
+   /** Default port region server listens on. */
+   public static final int DEFAULT_REGIONSERVER_PORT = 16020;
+ 
+   /** default port for region server web api */
+   public static final int DEFAULT_REGIONSERVER_INFOPORT = 16030;
+ 
+-  /** A configuration key for regionserver info port */
++  /** Configuration key for advertised region server web API port */
+   public static final String REGIONSERVER_INFO_PORT = "hbase.regionserver.info.port";
+ 
++  /** Configuration key for bound region server web API port. (Defaults to REGIONSERVER_INFO_PORT.) */
++  public static final String REGIONSERVER_BOUND_INFO_PORT = "hbase.regionserver.bound.info.port";
++
+   /** A flag that enables automatic selection of regionserver info port */
+   public static final String REGIONSERVER_INFO_PORT_AUTO = REGIONSERVER_INFO_PORT + ".auto";
+ 
+@@ -1397,6 +1415,9 @@ public final class HConstants {
+   /** Configuration key for setting RPC codec class name */
+   public static final String RPC_CODEC_CONF_KEY = "hbase.client.rpc.codec";
+ 
++  /** Configuration key for setting that the RPC client should bind the client address. This forces outgoing RPC traffic to happen from the same network interface that the RPC server is bound on. */
++  public static final String RPC_CLIENT_BIND_ADDRESS = "hbase.client.rpc.bind.address";
++
+   /** Configuration key for setting replication codec class name */
+   public static final String REPLICATION_CODEC_CONF_KEY = "hbase.replication.rpc.codec";
+ 
 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 9cafbb7cbf..8847ddaba0 100644
+index 9cafbb7cbf..313124d1d0 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
-@@ -17,6 +17,7 @@
+@@ -17,6 +17,8 @@
   */
  package org.apache.hadoop.hbase.master;
  
++import static org.apache.hadoop.hbase.HConstants.MASTER_BOUND_INFO_PORT;
 +import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
  import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_COORDINATED_BY_ZK;
  import static org.apache.hadoop.hbase.HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS;
  import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
-@@ -570,6 +571,11 @@ public class HMaster extends HRegionServer implements MasterServices {
+@@ -570,6 +572,18 @@ public class HMaster extends HRegionServer implements MasterServices {
      return conf.get(MASTER_HOSTNAME_KEY);
    }
  
 +  @Override
 +  protected int getUseThisPortInstead(Configuration conf) {
-+    return conf.getInt(MASTER_PORT, this.rpcServices.getSocketAddress().getPort());
++    int port = conf.getInt(MASTER_PORT, 0);
++    return port != 0 ? port : this.rpcServices.getSocketAddress().getPort();
++  }
++
++  @Override
++  protected int getUseThisInfoPortInstead(Configuration conf) {
++        int port = conf.getInt(MASTER_BOUND_INFO_PORT, 0);
++        return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
 +  }
 +
    private void registerConfigurationObservers() {
      configurationManager.registerObserver(this.rpcServices);
      configurationManager.registerObserver(this);
-@@ -597,8 +603,7 @@ public class HMaster extends HRegionServer implements MasterServices {
+@@ -597,8 +611,8 @@ public class HMaster extends HRegionServer implements MasterServices {
        registerConfigurationObservers();
        Threads.setDaemonThreadRunning(new Thread(() -> TraceUtil.trace(() -> {
          try {
 -          int infoPort = putUpJettyServer();
 -          startActiveMasterManager(infoPort);
++          putUpJettyServer();
 +          startActiveMasterManager(useThisInfoPortInstead);
          } catch (Throwable t) {
            // Make sure we log the exception.
            String error = "Failed to become Active Master";
-@@ -3006,7 +3011,7 @@ public class HMaster extends HRegionServer implements MasterServices {
+@@ -3006,7 +3020,7 @@ public class HMaster extends HRegionServer implements MasterServices {
          }
          case MASTER_INFO_PORT: {
            if (infoServer != null) {
@@ -53,18 +137,20 @@ index 9cafbb7cbf..8847ddaba0 100644
            break;
          }
 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 351b4fef19..5237f47fd4 100644
+index 351b4fef19..68f56ab796 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
-@@ -24,6 +24,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL
+@@ -24,6 +24,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL
  import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHORE_DURATION;
  import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_COORDINATED_BY_ZK;
  import static org.apache.hadoop.hbase.HConstants.HBASE_SPLIT_WAL_MAX_SPLITTER;
++import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_BOUND_INFO_PORT;
 +import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_PORT;
++import static org.apache.hadoop.hbase.HConstants.RPC_CLIENT_BIND_ADDRESS;
  import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_DEFAULT;
  import static org.apache.hadoop.hbase.master.waleventtracker.WALEventTrackerTableCreator.WAL_EVENT_TRACKER_ENABLED_KEY;
  import static org.apache.hadoop.hbase.namequeues.NamedQueueServiceChore.NAMED_QUEUE_CHORE_DURATION_DEFAULT;
-@@ -505,6 +506,10 @@ public class HRegionServer extends Thread
+@@ -505,6 +508,10 @@ public class HRegionServer extends Thread
     */
    protected String useThisHostnameInstead;
  
@@ -75,16 +161,16 @@ index 351b4fef19..5237f47fd4 100644
    /**
     * @deprecated since 2.4.0 and will be removed in 4.0.0. Use
     *             {@link HRegionServer#UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY} instead.
-@@ -669,6 +674,8 @@ public class HRegionServer extends Thread
+@@ -669,6 +676,8 @@ public class HRegionServer extends Thread
        this.namedQueueRecorder = NamedQueueRecorder.getInstance(this.conf);
        rpcServices = createRpcServices();
        useThisHostnameInstead = getUseThisHostnameInstead(conf);
 +      useThisPortInstead = getUseThisPortInstead(conf);
-+      useThisInfoPortInstead = conf.getInt("hbase.info.port" , this.infoServer != null ? this.infoServer.getPort() : -1);
++      useThisInfoPortInstead = getUseThisInfoPortInstead(conf);
  
        // if use-ip is enabled, we will use ip to expose Master/RS service for client,
        // see HBASE-27304 for details.
-@@ -678,7 +685,7 @@ public class HRegionServer extends Thread
+@@ -678,7 +687,7 @@ public class HRegionServer extends Thread
          useIp ? rpcServices.isa.getAddress().getHostAddress() : rpcServices.isa.getHostName();
        String hostName =
          StringUtils.isBlank(useThisHostnameInstead) ? isaHostName : useThisHostnameInstead;
@@ -93,7 +179,7 @@ index 351b4fef19..5237f47fd4 100644
  
        rpcControllerFactory = RpcControllerFactory.instantiate(this.conf);
        rpcRetryingCallerFactory = RpcRetryingCallerFactory.instantiate(this.conf,
-@@ -715,7 +722,7 @@ public class HRegionServer extends Thread
+@@ -715,7 +724,7 @@ public class HRegionServer extends Thread
  
        // Some unit tests don't need a cluster, so no zookeeper at all
        // Open connection to zookeeper and set primary watcher
@@ -102,27 +188,45 @@ index 351b4fef19..5237f47fd4 100644
          canCreateBaseZNode());
        // If no master in cluster, skip trying to track one or look for a cluster status.
        if (!this.masterless) {
-@@ -776,6 +783,10 @@ public class HRegionServer extends Thread
+@@ -776,6 +785,16 @@ public class HRegionServer extends Thread
      }
    }
  
 +  protected int getUseThisPortInstead(Configuration conf) {
-+    return conf.getInt(REGIONSERVER_PORT, this.rpcServices.isa.getPort());
++    int port = conf.getInt(REGIONSERVER_PORT, 0);
++    return port != 0 ? port : this.rpcServices.isa.getPort();
++  }
++
++  protected int getUseThisInfoPortInstead(Configuration conf) {
++    int port = conf.getInt(REGIONSERVER_BOUND_INFO_PORT, 0);
++    return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
 +  }
 +
    private void setupSignalHandlers() {
      if (!SystemUtils.IS_OS_WINDOWS) {
        HBasePlatformDependent.handle("HUP", (number, name) -> {
-@@ -958,7 +969,7 @@ public class HRegionServer extends Thread
+@@ -958,7 +977,7 @@ public class HRegionServer extends Thread
        }
        // Setup RPC client for master communication
        this.rpcClient = RpcClientFactory.createClient(conf, clusterId,
 -        new InetSocketAddress(this.rpcServices.isa.getAddress(), 0),
-+        new InetSocketAddress(0),
++        getInetSocketAddress(this.conf),
          clusterConnection.getConnectionMetrics(), Collections.emptyMap());
        span.setStatus(StatusCode.OK);
      } catch (Throwable t) {
-@@ -1528,11 +1539,7 @@ public class HRegionServer extends Thread
+@@ -972,6 +991,11 @@ public class HRegionServer extends Thread
+     }
+   }
+ 
++  private InetSocketAddress getInetSocketAddress(Configuration conf) {
++    return conf.getBoolean(RPC_CLIENT_BIND_ADDRESS, true) ?
++      new InetSocketAddress(this.rpcServices.isa.getAddress(), 0) : new InetSocketAddress(0);
++  }
++
+   /**
+    * Bring up connection to zk ensemble and then wait until a master for this cluster and then after
+    * that, wait until cluster 'up' flag has been set. This is the order in which master does things.
+@@ -1528,11 +1552,7 @@ public class HRegionServer extends Thread
  
      serverLoad.setReportStartTime(reportStartTime);
      serverLoad.setReportEndTime(reportEndTime);
@@ -135,7 +239,7 @@ index 351b4fef19..5237f47fd4 100644
      MetricsUserAggregateSource userSource =
        metricsRegionServer.getMetricsUserAggregate().getSource();
      if (userSource != null) {
-@@ -1688,7 +1695,7 @@ public class HRegionServer extends Thread
+@@ -1688,7 +1708,7 @@ public class HRegionServer extends Thread
          if (key.equals(HConstants.KEY_FOR_HOSTNAME_SEEN_BY_MASTER)) {
            String hostnameFromMasterPOV = e.getValue();
            this.serverName = ServerName.valueOf(hostnameFromMasterPOV,
@@ -144,7 +248,7 @@ index 351b4fef19..5237f47fd4 100644
            String expectedHostName = rpcServices.getSocketAddress().getHostName();
            // if Master use-ip is enabled, RegionServer use-ip will be enabled by default even if it
            // is set to disable. so we will use the ip of the RegionServer to compare with the
-@@ -1814,7 +1821,7 @@ public class HRegionServer extends Thread
+@@ -1814,7 +1834,7 @@ public class HRegionServer extends Thread
  
    private void createMyEphemeralNode() throws KeeperException {
      RegionServerInfo.Builder rsInfo = RegionServerInfo.newBuilder();
@@ -153,7 +257,7 @@ index 351b4fef19..5237f47fd4 100644
      rsInfo.setVersionInfo(ProtobufUtil.getVersionInfo());
      byte[] data = ProtobufUtil.prependPBMagic(rsInfo.build().toByteArray());
      ZKUtil.createEphemeralNodeAndWatch(this.zooKeeper, getMyEphemeralNodePath(), data);
-@@ -2481,7 +2488,7 @@ public class HRegionServer extends Thread
+@@ -2481,7 +2501,7 @@ public class HRegionServer extends Thread
          LOG.info("Retry starting http info server with port: " + port);
        }
      }
@@ -162,7 +266,7 @@ index 351b4fef19..5237f47fd4 100644
      conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
      int masterInfoPort =
        conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-@@ -3075,12 +3082,11 @@ public class HRegionServer extends Thread
+@@ -3075,12 +3095,11 @@ public class HRegionServer extends Thread
        LOG.info("reportForDuty to master=" + masterServerName + " with isa=" + rpcServices.isa
          + ", startcode=" + this.startcode);
        long now = EnvironmentEdgeManager.currentTime();
@@ -177,23 +281,34 @@ index 351b4fef19..5237f47fd4 100644
        request.setServerCurrentTime(now);
        result = rss.regionServerStartup(null, request.build());
 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 b77fcf338a..1f5c9dd21f 100644
+index b77fcf338a..a86cd273ff 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
-@@ -1270,14 +1270,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, AdminService.Blockin
+@@ -280,6 +280,10 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescr
+ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.CompactionDescriptor;
+ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.FlushDescriptor;
+ import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.RegionEventDescriptor;
++import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_ADDRESS;
++import static org.apache.hadoop.hbase.HConstants.MASTER_IPC_PORT;
++import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_ADDRESS;
++import static org.apache.hadoop.hbase.HConstants.REGIONSERVER_IPC_PORT;
+ 
+ /**
+  * Implements the regionserver RPC services.
+@@ -1270,14 +1274,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, AdminService.Blockin
        int port = conf.getInt(HConstants.MASTER_PORT, HConstants.DEFAULT_MASTER_PORT);
        // Creation of a HSA will force a resolve.
        initialIsa = new InetSocketAddress(hostname, port);
 -      bindAddress = new InetSocketAddress(conf.get("hbase.master.ipc.address", hostname), port);
-+      bindAddress = new InetSocketAddress(conf.get("hbase.master.ipc.address", hostname), conf.getInt("hbase.master.ipc.port", port));
++      bindAddress = new InetSocketAddress(conf.get(MASTER_IPC_ADDRESS, hostname), conf.getInt(MASTER_IPC_PORT, port));
      } else {
        String hostname = DNS.getHostname(conf, DNS.ServerType.REGIONSERVER);
        int port = conf.getInt(HConstants.REGIONSERVER_PORT, HConstants.DEFAULT_REGIONSERVER_PORT);
        // Creation of a HSA will force a resolve.
        initialIsa = new InetSocketAddress(hostname, port);
        bindAddress =
 -        new InetSocketAddress(conf.get("hbase.regionserver.ipc.address", hostname), port);
-+        new InetSocketAddress(conf.get("hbase.regionserver.ipc.address", hostname), conf.getInt("hbase.regionserver.ipc.port", port));
++        new InetSocketAddress(conf.get(REGIONSERVER_IPC_ADDRESS, hostname), conf.getInt(REGIONSERVER_IPC_PORT, port));
      }
      if (initialIsa.getAddress() == null) {
        throw new IllegalArgumentException("Failed resolve of " + initialIsa);
