Skip to content

Commit ceba85b

Browse files
committed
removed dead variable
1 parent be89d58 commit ceba85b

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
From 00ec82be6136e55d4d901e28791bc3ce36d726c7 Mon Sep 17 00:00:00 2001
1+
From f2360ad266a17eb342eb826ae9dad08d3293b580 Mon Sep 17 00:00:00 2001
22
From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= <[email protected]>
33
Date: Fri, 30 May 2025 14:26:26 +0200
44
Subject: Allow overriding ipc bind port and use alternative port from listener
55

66
---
7-
.../apache/hadoop/hbase/master/HMaster.java | 10 +++++--
7+
.../apache/hadoop/hbase/master/HMaster.java | 11 ++++++--
88
.../hbase/regionserver/HRegionServer.java | 28 +++++++++++++------
99
.../hbase/regionserver/RSRpcServices.java | 4 +--
10-
3 files changed, 30 insertions(+), 12 deletions(-)
10+
3 files changed, 30 insertions(+), 13 deletions(-)
1111

1212
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
13-
index 3fe5abac27..be0136193b 100644
13+
index 3fe5abac27..6d40db77ae 100644
1414
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
1515
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
1616
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.master;
@@ -33,16 +33,17 @@ index 3fe5abac27..be0136193b 100644
3333
private void registerConfigurationObservers() {
3434
configurationManager.registerObserver(this.rpcServices);
3535
configurationManager.registerObserver(this);
36-
@@ -587,7 +593,7 @@ public class HMaster extends HRegionServer implements MasterServices {
36+
@@ -586,8 +592,7 @@ public class HMaster extends HRegionServer implements MasterServices {
37+
registerConfigurationObservers();
3738
Threads.setDaemonThreadRunning(new Thread(() -> TraceUtil.trace(() -> {
3839
try {
39-
int infoPort = putUpJettyServer();
40+
- int infoPort = putUpJettyServer();
4041
- startActiveMasterManager(infoPort);
4142
+ startActiveMasterManager(useThisInfoPortInstead);
4243
} catch (Throwable t) {
4344
// Make sure we log the exception.
4445
String error = "Failed to become Active Master";
45-
@@ -2991,7 +2997,7 @@ public class HMaster extends HRegionServer implements MasterServices {
46+
@@ -2991,7 +2996,7 @@ public class HMaster extends HRegionServer implements MasterServices {
4647
}
4748
case MASTER_INFO_PORT: {
4849
if (infoServer != null) {

0 commit comments

Comments
 (0)