From c018e556433a2f8fb3f730d372331dc173a8a691 Mon Sep 17 00:00:00 2001 From: Shrijeet Paliwal Date: Fri, 24 Aug 2012 17:10:56 -0700 Subject: [PATCH] HBASE-6662 RS incorrectly reports master's address Region server incorrectly reports its own address as Master's address while announcing successful connection to Master. Rename local variable *isa* (which holds master's address) to a different name to avoid a conflict with field variable which holds region server's address. --- .../hadoop/hbase/regionserver/HRegionServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3ba1e24..00d0961 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 @@ -1903,7 +1903,7 @@ public class HRegionServer implements ClientProtocol, continue; } - InetSocketAddress isa = + InetSocketAddress masterIsa = new InetSocketAddress(masterServerName.getHostname(), masterServerName.getPort()); LOG.info("Attempting connect to Master server at " + @@ -1913,9 +1913,9 @@ public class HRegionServer implements ClientProtocol, // should retry indefinitely. master = (RegionServerStatusProtocol) HBaseRPC.waitForProxy( RegionServerStatusProtocol.class, RegionServerStatusProtocol.VERSION, - isa, this.conf, -1, + masterIsa, this.conf, -1, this.rpcTimeout, this.rpcTimeout); - LOG.info("Connected to master at " + isa); + LOG.info("Connected to master at " + masterIsa); } catch (IOException e) { e = e instanceof RemoteException ? ((RemoteException)e).unwrapRemoteException() : e; -- 1.7.9.6 (Apple Git-31.1)