Consistently override the advertised ports

Author: nightkr

hbase/stackable/bin/hbase-entrypoint.sh

@@ -78,6 +78,10 @@ fi
 # Service endpoints
 HBASE_SERVICE_HOST=$(cat /stackable/listener/default-address/address)
 HBASE_SERVICE_PORT=$(cat /stackable/listener/default-address/ports/"${HBASE_PORT_NAME}")
+HBASE_INFO_PORT=$(cat /stackable/listener/default-address/ports/ui-http)
+export HBASE_SERVICE_HOST
+export HBASE_SERVICE_PORT
+export HBASE_INFO_PORT
 sed -i -e s/\$\{HBASE_SERVICE_HOST\}/"${HBASE_SERVICE_HOST}"/g /stackable/conf/hbase-site.xml
 sed -i -e s/\$\{HBASE_SERVICE_PORT\}/"${HBASE_SERVICE_PORT}"/g /stackable/conf/hbase-site.xml
 

hbase/stackable/patches/2.6.1/0001-HBASE-28242-Updates-async-profiler-support.patch

@@ -4,8 +4,8 @@ Date: Tue, 6 Feb 2024 16:10:54 +0100
 Subject: HBASE-28242: Updates async-profiler support
 
 ---
- .../hadoop/hbase/http/ProfileServlet.java     | 207 +++++++++++-------
- 1 file changed, 122 insertions(+), 85 deletions(-)
+ .../hadoop/hbase/http/ProfileServlet.java     | 205 +++++++++++-------
+ 1 file changed, 121 insertions(+), 84 deletions(-)
 
 diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
 index 83087dbed3..6139114717 100644
@@ -106,22 +106,21 @@ index 83087dbed3..6139114717 100644
      ALLOC("alloc"),
      LOCK("lock"),
 -    PAGE_FAULTS("page-faults"),
--    CONTEXT_SWITCHES("context-switches"),
--    CYCLES("cycles"),
--    INSTRUCTIONS("instructions"),
--    CACHE_REFERENCES("cache-references"),
--    CACHE_MISSES("cache-misses"),
--    BRANCHES("branches"),
 +    ITIMER("itimer"),
 +    BRANCH_INSTRUCTIONS("branch-instructions"),
-     BRANCH_MISSES("branch-misses"),
-     BUS_CYCLES("bus-cycles"),
++    BRANCH_MISSES("branch-misses"),
++    BUS_CYCLES("bus-cycles"),
 +    CACHE_MISSES("cache-misses"),
 +    CACHE_REFERENCES("cache-references"),
-+    CONTEXT_SWITCHES("context-switches"),
-+    CYCLES("cycles"),
+     CONTEXT_SWITCHES("context-switches"),
+     CYCLES("cycles"),
 +    DTLB_LOAD_MISSES("dTLB-load-misses"),
-+    INSTRUCTIONS("instructions"),
+     INSTRUCTIONS("instructions"),
+-    CACHE_REFERENCES("cache-references"),
+-    CACHE_MISSES("cache-misses"),
+-    BRANCHES("branches"),
+-    BRANCH_MISSES("branch-misses"),
+-    BUS_CYCLES("bus-cycles"),
      L1_DCACHE_LOAD_MISSES("L1-dcache-load-misses"),
      LLC_LOAD_MISSES("LLC-load-misses"),
 -    DTLB_LOAD_MISSES("dTLB-load-misses"),

hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port.patch

@@ -0,0 +1,30 @@
+From 93620b3eecc29ca0a973891902a3a66944aa2305 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= <[email protected]>
+Date: Fri, 30 May 2025 14:26:26 +0200
+Subject: Allow overriding ipc bind port
+
+---
+ .../org/apache/hadoop/hbase/regionserver/RSRpcServices.java   | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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);