hbase: patch for 2.6.2 endpoints

Author: adwk67

…s/2.6.1/0006-Use-this-port-instead.patch …pc-bind-port-and-use-alternative-p.patchhbase/stackable/patches/2.6.1/0006-Use-this-port-instead.patch renamed to hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch hbase/stackable/patches/2.6.1/0006-Use-this-port-instead.patch renamed to hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch

@@ -1,31 +1,39 @@
-From c17e6c5bc3a942600eb901798654d767448c1e16 Mon Sep 17 00:00:00 2001
+From 00ec82be6136e55d4d901e28791bc3ce36d726c7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= <nat@nullable.se>
-Date: Fri, 30 May 2025 15:36:36 +0200
-Subject: Use this port instead
+Date: Fri, 30 May 2025 14:26:26 +0200
+Subject: Allow overriding ipc bind port and use alternative port from listener
 
 ---
- .../hadoop/hbase/ipc/RpcClientFactory.java    |  1 +
- .../apache/hadoop/hbase/master/HMaster.java   |  4 ++--
- .../hbase/regionserver/HRegionServer.java     | 22 +++++++++++++------
- 3 files changed, 18 insertions(+), 9 deletions(-)
+ .../apache/hadoop/hbase/master/HMaster.java   | 10 +++++--
+ .../hbase/regionserver/HRegionServer.java     | 28 +++++++++++++------
+ .../hbase/regionserver/RSRpcServices.java     |  4 +--
+ 3 files changed, 30 insertions(+), 12 deletions(-)
 
-diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientFactory.java
-index fa65739c16..501b6b7637 100644
---- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientFactory.java
-+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientFactory.java
-@@ -99,6 +99,7 @@ public final class RpcClientFactory {
-    */
-   public static RpcClient createClient(Configuration conf, String clusterId,
-     SocketAddress localAddr, MetricsConnection metrics, Map<String, byte[]> connectionAttributes) {
-+    new Exception("BATMAN creating client localAddr="+localAddr).printStackTrace();
-     String rpcClientClass = getRpcClientClass(conf);
-     return ReflectionUtils.instantiateWithCustomCtor(
-       rpcClientClass, new Class[] { Configuration.class, String.class, SocketAddress.class,
 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 3fe5abac27..5719f276bf 100644
+index 3fe5abac27..be0136193b 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
-@@ -587,7 +587,7 @@ public class HMaster extends HRegionServer implements MasterServices {
+@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.master;
+ 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;
++import static org.apache.hadoop.hbase.HConstants.MASTER_PORT;
+ import static org.apache.hadoop.hbase.master.cleaner.HFileCleaner.CUSTOM_POOL_SIZE;
+ import static org.apache.hadoop.hbase.util.DNS.MASTER_HOSTNAME_KEY;
+ 
+@@ -559,6 +560,11 @@ 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());
++  }
++
+   private void registerConfigurationObservers() {
+     configurationManager.registerObserver(this.rpcServices);
+     configurationManager.registerObserver(this);
+@@ -587,7 +593,7 @@ public class HMaster extends HRegionServer implements MasterServices {
        Threads.setDaemonThreadRunning(new Thread(() -> TraceUtil.trace(() -> {
          try {
            int infoPort = putUpJettyServer();
@@ -34,7 +42,7 @@ index 3fe5abac27..5719f276bf 100644
          } catch (Throwable t) {
            // Make sure we log the exception.
            String error = "Failed to become Active Master";
-@@ -2991,7 +2991,7 @@ public class HMaster extends HRegionServer implements MasterServices {
+@@ -2991,7 +2997,7 @@ public class HMaster extends HRegionServer implements MasterServices {
          }
          case MASTER_INFO_PORT: {
            if (infoServer != null) {
@@ -44,10 +52,18 @@ index 3fe5abac27..5719f276bf 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 27bcef2f06..d18ad91c3a 100644
+index 27bcef2f06..80949070fd 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
-@@ -505,6 +505,10 @@ public class HRegionServer extends Thread
+@@ -24,6 +24,7 @@ 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_PORT;
+ 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
     */
    protected String useThisHostnameInstead;
 
@@ -58,16 +74,16 @@ index 27bcef2f06..d18ad91c3a 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 +673,8 @@ public class HRegionServer extends Thread
+@@ -669,6 +674,8 @@ public class HRegionServer extends Thread
        this.namedQueueRecorder = NamedQueueRecorder.getInstance(this.conf);
        rpcServices = createRpcServices();
        useThisHostnameInstead = getUseThisHostnameInstead(conf);
-+      useThisPortInstead = Integer.parseInt(System.getenv("HBASE_SERVICE_PORT"));
-+      useThisInfoPortInstead = Integer.parseInt(System.getenv("HBASE_INFO_PORT"));
++      useThisPortInstead = getUseThisPortInstead(conf);
++      useThisInfoPortInstead = conf.getInt("hbase.info.port" , this.infoServer != null ? this.infoServer.getPort() : -1);
 
        // if use-ip is enabled, we will use ip to expose Master/RS service for client,
        // see HBASE-27304 for details.
-@@ -678,7 +684,7 @@ public class HRegionServer extends Thread
+@@ -678,7 +685,7 @@ public class HRegionServer extends Thread
          useIp ? rpcServices.isa.getAddress().getHostAddress() : rpcServices.isa.getHostName();
        String hostName =
          StringUtils.isBlank(useThisHostnameInstead) ? isaHostName : useThisHostnameInstead;
@@ -76,7 +92,7 @@ index 27bcef2f06..d18ad91c3a 100644
 
        rpcControllerFactory = RpcControllerFactory.instantiate(this.conf);
        rpcRetryingCallerFactory = RpcRetryingCallerFactory.instantiate(this.conf,
-@@ -715,7 +721,7 @@ public class HRegionServer extends Thread
+@@ -715,7 +722,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
@@ -85,16 +101,27 @@ index 27bcef2f06..d18ad91c3a 100644
          canCreateBaseZNode());
        // If no master in cluster, skip trying to track one or look for a cluster status.
        if (!this.masterless) {
-@@ -958,7 +964,7 @@ public class HRegionServer extends Thread
+@@ -776,6 +783,10 @@ public class HRegionServer extends Thread
+     }
+   }
+ 
++  protected int getUseThisPortInstead(Configuration conf) {
++    return conf.getInt(REGIONSERVER_PORT, this.rpcServices.isa.getPort());
++  }
++
+   private void setupSignalHandlers() {
+     if (!SystemUtils.IS_OS_WINDOWS) {
+       HBasePlatformDependent.handle("HUP", (number, name) -> {
+@@ -958,7 +969,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(/*this.rpcServices.isa.getAddress(), */0),
++        new InetSocketAddress(0),
          clusterConnection.getConnectionMetrics(), Collections.emptyMap());
        span.setStatus(StatusCode.OK);
      } catch (Throwable t) {
-@@ -1533,6 +1539,8 @@ public class HRegionServer extends Thread
+@@ -1533,6 +1544,8 @@ public class HRegionServer extends Thread
      } else {
        serverLoad.setInfoServerPort(-1);
      }
@@ -103,7 +130,7 @@ index 27bcef2f06..d18ad91c3a 100644
      MetricsUserAggregateSource userSource =
        metricsRegionServer.getMetricsUserAggregate().getSource();
      if (userSource != null) {
-@@ -1688,7 +1696,7 @@ public class HRegionServer extends Thread
+@@ -1688,7 +1701,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,
@@ -112,7 +139,7 @@ index 27bcef2f06..d18ad91c3a 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 +1822,7 @@ public class HRegionServer extends Thread
+@@ -1814,7 +1827,7 @@ public class HRegionServer extends Thread
 
    private void createMyEphemeralNode() throws KeeperException {
      RegionServerInfo.Builder rsInfo = RegionServerInfo.newBuilder();
@@ -121,7 +148,7 @@ index 27bcef2f06..d18ad91c3a 100644
      rsInfo.setVersionInfo(ProtobufUtil.getVersionInfo());
      byte[] data = ProtobufUtil.prependPBMagic(rsInfo.build().toByteArray());
      ZKUtil.createEphemeralNodeAndWatch(this.zooKeeper, getMyEphemeralNodePath(), data);
-@@ -2479,7 +2487,7 @@ public class HRegionServer extends Thread
+@@ -2479,7 +2492,7 @@ public class HRegionServer extends Thread
          LOG.info("Retry starting http info server with port: " + port);
        }
      }
@@ -130,7 +157,12 @@ index 27bcef2f06..d18ad91c3a 100644
      conf.setInt(HConstants.REGIONSERVER_INFO_PORT, port);
      int masterInfoPort =
        conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
-@@ -3078,7 +3086,7 @@ public class HRegionServer extends Thread
+@@ -3073,12 +3086,11 @@ public class HRegionServer extends Thread
+       LOG.info("reportForDuty to master=" + masterServerName + " with isa=" + rpcServices.isa
+         + ", startcode=" + this.startcode);
+       long now = EnvironmentEdgeManager.currentTime();
+-      int port = rpcServices.isa.getPort();
+       RegionServerStartupRequest.Builder request = RegionServerStartupRequest.newBuilder();
        if (!StringUtils.isBlank(useThisHostnameInstead)) {
          request.setUseThisHostnameInstead(useThisHostnameInstead);
        }
@@ -139,3 +171,24 @@ index 27bcef2f06..d18ad91c3a 100644
        request.setServerStartCode(this.startcode);
        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
+--- 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
+       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));
+     } 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));
+     }
+     if (initialIsa.getAddress() == null) {
+       throw new IllegalArgumentException("Failed resolve of " + initialIsa);