Skip to content

Commit 65aaae2

Browse files
adwk67adwk67
committed
provide advertised port as a fallback, removed changes to test class
1 parent f3d3596 commit 65aaae2

File tree

2 files changed

+22
-60
lines changed

2 files changed

+22
-60
lines changed

‎hbase/hbase/stackable/patches/2.6.1/0006-Update-property-usage-for-bound-ports.patch‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
From 635aa32bc6fefaefb90d754dcc4ccd67e4cdfa24 Mon Sep 17 00:00:00 2001
1+
From 5cc38b12c2bfc5fa3850e13e3eb87086d5f1737a Mon Sep 17 00:00:00 2001
22
From: Andrew Kenworthy <[email protected]>
33
Date: Thu, 26 Jun 2025 14:59:01 +0200
44
Subject: Update property usage for bound ports
55

66
---
77
.../org/apache/hadoop/hbase/HConstants.java | 4 ++--
8-
.../hadoop/hbase/LocalHBaseCluster.java | 12 ++++++------
8+
.../hadoop/hbase/LocalHBaseCluster.java | 12 +++++------
99
.../apache/hadoop/hbase/master/HMaster.java | 6 +++---
10-
.../hbase/regionserver/HRegionServer.java | 19 +++++++++++++------
11-
.../util/ProcessBasedLocalHBaseCluster.java | 4 ++--
12-
5 files changed, 26 insertions(+), 19 deletions(-)
10+
.../hbase/regionserver/HRegionServer.java | 21 +++++++++++++------
11+
4 files changed, 26 insertions(+), 17 deletions(-)
1312

1413
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
1514
index ea96ff8fce..054beb10d3 100644
@@ -96,7 +95,7 @@ index 2f323518da..37cd7b3afd 100644
9695
}
9796

9897
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
99-
index 11bd1e58b5..abeeab3552 100644
98+
index 11bd1e58b5..358ce486f1 100644
10099
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
101100
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
102101
@@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR
@@ -116,21 +115,23 @@ index 11bd1e58b5..abeeab3552 100644
116115
return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
117116
}
118117

119-
@@ -2463,11 +2464,11 @@ public class HRegionServer extends Thread
118+
@@ -2463,11 +2464,13 @@ public class HRegionServer extends Thread
120119
*/
121120
private void putUpWebUI() throws IOException {
122121
int port =
123122
- this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
124-
+ this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
123+
+ this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT,
124+
+ this.conf.getInt(REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT));
125125
String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0");
126126

127127
if (this instanceof HMaster) {
128128
- port = conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
129-
+ port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
129+
+ port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT,
130+
+ this.conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT));
130131
addr = this.conf.get("hbase.master.info.bindAddress", "0.0.0.0");
131132
}
132133
// -1 is for disabling info server
133-
@@ -2503,12 +2504,18 @@ public class HRegionServer extends Thread
134+
@@ -2503,12 +2506,18 @@ public class HRegionServer extends Thread
134135
LOG.info("Retry starting http info server with port: " + port);
135136
}
136137
}
@@ -152,23 +153,3 @@ index 11bd1e58b5..abeeab3552 100644
152153
}
153154

154155
/*
155-
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
156-
index 21c49e61ba..2dd85ab764 100644
157-
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
158-
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
159-
@@ -370,13 +370,13 @@ public class ProcessBasedLocalHBaseCluster {
160-
161-
int masterInfoPort = HBaseTestingUtility.randomFreePort();
162-
reportWebUIPort("master", masterInfoPort);
163-
- confMap.put(HConstants.MASTER_INFO_PORT, masterInfoPort);
164-
+ confMap.put(HConstants.MASTER_BOUND_INFO_PORT, masterInfoPort);
165-
} else if (serverType == ServerType.RS) {
166-
confMap.put(HConstants.REGIONSERVER_PORT, rpcPort);
167-
168-
int rsInfoPort = HBaseTestingUtility.randomFreePort();
169-
reportWebUIPort("region server", rsInfoPort);
170-
- confMap.put(HConstants.REGIONSERVER_INFO_PORT, rsInfoPort);
171-
+ confMap.put(HConstants.REGIONSERVER_BOUND_INFO_PORT, rsInfoPort);
172-
} else {
173-
confMap.put(HConstants.ZOOKEEPER_DATA_DIR, daemonDir);
174-
}

‎hbase/hbase/stackable/patches/2.6.2/0006-Update-property-usage-for-bound-ports.patch‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
From af07f7d502fcd6a5566b7cb327dd7a154054a9fc Mon Sep 17 00:00:00 2001
1+
From a36c936d8132bad255bb2be40e4b1dde2a44f478 Mon Sep 17 00:00:00 2001
22
From: Andrew Kenworthy <[email protected]>
33
Date: Thu, 26 Jun 2025 16:58:47 +0200
44
Subject: Update property usage for bound ports
55

66
---
77
.../org/apache/hadoop/hbase/HConstants.java | 4 ++--
8-
.../hadoop/hbase/LocalHBaseCluster.java | 12 ++++++------
8+
.../hadoop/hbase/LocalHBaseCluster.java | 12 +++++------
99
.../apache/hadoop/hbase/master/HMaster.java | 6 +++---
10-
.../hbase/regionserver/HRegionServer.java | 19 +++++++++++++------
11-
.../util/ProcessBasedLocalHBaseCluster.java | 4 ++--
12-
5 files changed, 26 insertions(+), 19 deletions(-)
10+
.../hbase/regionserver/HRegionServer.java | 21 +++++++++++++------
11+
4 files changed, 26 insertions(+), 17 deletions(-)
1312

1413
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
1514
index 4d892755d2..3f852e7acc 100644
@@ -96,7 +95,7 @@ index 313124d1d0..00e01c116e 100644
9695
}
9796

9897
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
99-
index 68f56ab796..3d1d2d3a5c 100644
98+
index 68f56ab796..b610d11651 100644
10099
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
101100
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
102101
@@ -25,6 +25,7 @@ import static org.apache.hadoop.hbase.HConstants.DEFAULT_SLOW_LOG_SYS_TABLE_CHOR
@@ -116,22 +115,24 @@ index 68f56ab796..3d1d2d3a5c 100644
116115
return port != 0 ? port : this.infoServer != null ? this.infoServer.getPort() : -1;
117116
}
118117

119-
@@ -2459,12 +2460,12 @@ public class HRegionServer extends Thread
118+
@@ -2459,12 +2460,14 @@ public class HRegionServer extends Thread
120119
*/
121120
private void putUpWebUI() throws IOException {
122121
int port =
123122
- this.conf.getInt(HConstants.REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
124-
+ this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
123+
+ this.conf.getInt(REGIONSERVER_BOUND_INFO_PORT,
124+
+ this.conf.getInt(REGIONSERVER_INFO_PORT, HConstants.DEFAULT_REGIONSERVER_INFOPORT));
125125
String addr = this.conf.get("hbase.regionserver.info.bindAddress", "0.0.0.0");
126126

127127
boolean isMaster = false;
128128
if (this instanceof HMaster) {
129129
- port = conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
130-
+ port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
130+
+ port = conf.getInt(HConstants.MASTER_BOUND_INFO_PORT,
131+
+ this.conf.getInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT));
131132
addr = this.conf.get("hbase.master.info.bindAddress", "0.0.0.0");
132133
isMaster = true;
133134
}
134-
@@ -2501,12 +2502,18 @@ public class HRegionServer extends Thread
135+
@@ -2501,12 +2504,18 @@ public class HRegionServer extends Thread
135136
LOG.info("Retry starting http info server with port: " + port);
136137
}
137138
}
@@ -153,23 +154,3 @@ index 68f56ab796..3d1d2d3a5c 100644
153154
}
154155

155156
/*
156-
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
157-
index 21c49e61ba..2dd85ab764 100644
158-
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
159-
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java
160-
@@ -370,13 +370,13 @@ public class ProcessBasedLocalHBaseCluster {
161-
162-
int masterInfoPort = HBaseTestingUtility.randomFreePort();
163-
reportWebUIPort("master", masterInfoPort);
164-
- confMap.put(HConstants.MASTER_INFO_PORT, masterInfoPort);
165-
+ confMap.put(HConstants.MASTER_BOUND_INFO_PORT, masterInfoPort);
166-
} else if (serverType == ServerType.RS) {
167-
confMap.put(HConstants.REGIONSERVER_PORT, rpcPort);
168-
169-
int rsInfoPort = HBaseTestingUtility.randomFreePort();
170-
reportWebUIPort("region server", rsInfoPort);
171-
- confMap.put(HConstants.REGIONSERVER_INFO_PORT, rsInfoPort);
172-
+ confMap.put(HConstants.REGIONSERVER_BOUND_INFO_PORT, rsInfoPort);
173-
} else {
174-
confMap.put(HConstants.ZOOKEEPER_DATA_DIR, daemonDir);
175-
}

0 commit comments

Comments
 (0)