Skip to content

Commit b5f96d5

Browse files
committed
patches I
1 parent 0fbe36b commit b5f96d5

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From e863257c8f75ef7be7052b380d88feff3b488409 Mon Sep 17 00:00:00 2001
2+
From: Andrew Kenworthy <[email protected]>
3+
Date: Thu, 10 Apr 2025 16:46:51 +0200
4+
Subject: log statement
5+
6+
---
7+
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
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
11+
index 27bcef2f06..68e9f8cd06 100644
12+
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
13+
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
14+
@@ -769,6 +769,7 @@ public class HRegionServer extends Thread
15+
+ UNSAFE_RS_HOSTNAME_KEY + " is used";
16+
throw new IOException(msg);
17+
} else {
18+
+ LOG.info("Hostname: {}", rpcServices.isa.getHostName());
19+
return rpcServices.isa.getHostName();
20+
}
21+
} else {
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
From 36f9523968315fa359f86ced664bd6bae9613e26 Mon Sep 17 00:00:00 2001
2+
From: Andrew Kenworthy <[email protected]>
3+
Date: Thu, 10 Apr 2025 16:53:18 +0200
4+
Subject: another log statement
5+
6+
---
7+
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 1 +
8+
1 file changed, 1 insertion(+)
9+
10+
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
11+
index 68e9f8cd06..b632b93820 100644
12+
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
13+
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
14+
@@ -1691,6 +1691,7 @@ public class HRegionServer extends Thread
15+
this.serverName = ServerName.valueOf(hostnameFromMasterPOV,
16+
rpcServices.getSocketAddress().getPort(), this.startcode);
17+
String expectedHostName = rpcServices.getSocketAddress().getHostName();
18+
+ LOG.info("Expected hostname: {}", expectedHostName);
19+
// if Master use-ip is enabled, RegionServer use-ip will be enabled by default even if it
20+
// is set to disable. so we will use the ip of the RegionServer to compare with the
21+
// hostname passed by the Master, see HBASE-27304 for details.

0 commit comments

Comments
 (0)