corrected constant descriptions

Author: adwk67

hbase/hbase/stackable/patches/2.6.1/0005-Allow-overriding-ipc-bind-port-and-use-alternative-p.patch

@@ -1,60 +1,74 @@
-From af804478fc88fdd354611ef2e0374c83874fa685 Mon Sep 17 00:00:00 2001
+From e84ed39191101b7dac7a6970afafc00dcec0f135 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 and use alternative port from listener
 
 ---
- .../org/apache/hadoop/hbase/HConstants.java   | 21 ++++++++++
+ .../org/apache/hadoop/hbase/HConstants.java   | 29 +++++++++++--
  .../apache/hadoop/hbase/master/HMaster.java   | 20 +++++++--
  .../hbase/regionserver/HRegionServer.java     | 41 +++++++++++++++----
  .../hbase/regionserver/RSRpcServices.java     |  8 +++-
- 4 files changed, 76 insertions(+), 14 deletions(-)
+ 4 files changed, 80 insertions(+), 18 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 3b2a58827f..1ba1feefcb 100644
+index 3b2a58827f..ea96ff8fce 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
-@@ -197,6 +197,12 @@ public final class HConstants {
-   /** Parameter name for port master listens on. */
+@@ -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 master IPC address */
++  /** 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 master IPC port */
++  /** 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;
 
-@@ -206,6 +212,9 @@ public final class HConstants {
-   /** Configuration key for master web API port */
+   /** 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 */
++  /** 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";
 
-@@ -316,6 +325,12 @@ public final class HConstants {
-   /** Parameter name for port region server listens on. */
+@@ -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 master IPC address */
++  /** 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 master IPC port */
++  /** 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;
 
-@@ -325,6 +340,9 @@ public final class HConstants {
-   /** A configuration key for regionserver info port */
+   /** 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";
 
-+  /** A configuration key for bound regionserver hbase 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 */
@@ -64,8 +78,8 @@ index 3b2a58827f..1ba1feefcb 100644
    /** 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 specify the host */
-+  public static final String RPC_CLIENT_SPECIFY_HOST = "hbase.rpc.client.specify.host";
++  /** 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";
@@ -123,7 +137,7 @@ index 3fe5abac27..2f323518da 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..3c180f6cd6 100644
+index 27bcef2f06..11bd1e58b5 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,9 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_HBASE_SPLIT_WAL_MAX_SPL
@@ -132,7 +146,7 @@ index 27bcef2f06..3c180f6cd6 100644
  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_SPECIFY_HOST;
++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;
@@ -152,7 +166,7 @@ index 27bcef2f06..3c180f6cd6 100644
        rpcServices = createRpcServices();
        useThisHostnameInstead = getUseThisHostnameInstead(conf);
 +      useThisPortInstead = getUseThisPortInstead(conf);
-+      useThisInfoPortInstead = getUseThisInfoPortInstead(conf); //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.
@@ -206,7 +220,7 @@ index 27bcef2f06..3c180f6cd6 100644
    }
 
 +  private InetSocketAddress getInetSocketAddress(Configuration conf) {
-+    return conf.getBoolean(RPC_CLIENT_SPECIFY_HOST, true) ?
++    return conf.getBoolean(RPC_CLIENT_BIND_ADDRESS, true) ?
 +      new InetSocketAddress(this.rpcServices.isa.getAddress(), 0) : new InetSocketAddress(0);
 +  }
 +