From b0eafb9ff1aa1e9a679548fc97378a66fcf34bec Mon Sep 17 00:00:00 2001 From: Shrijeet Paliwal Date: Fri, 24 Aug 2012 17:02:36 -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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index dc11099..5d46713 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1612,6 +1612,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, private ServerName getMaster() { ServerName masterServerName = null; HMasterRegionInterface master = null; + InetSocketAddress masterIsa = null; while (keepLooping() && master == null) { masterServerName = this.masterAddressManager.getMasterAddress(); if (masterServerName == null) { @@ -1625,7 +1626,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, continue; } - InetSocketAddress isa = + masterIsa = new InetSocketAddress(masterServerName.getHostname(), masterServerName.getPort()); LOG.info("Attempting connect to Master server at " + @@ -1635,7 +1636,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, // should retry indefinitely. master = (HMasterRegionInterface) HBaseRPC.waitForProxy( HMasterRegionInterface.class, HMasterRegionInterface.VERSION, - isa, this.conf, -1, + masterIsa, this.conf, -1, this.rpcTimeout, this.rpcTimeout); } catch (IOException e) { e = e instanceof RemoteException ? @@ -1648,7 +1649,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, sleeper.sleep(); } } - LOG.info("Connected to master at " + isa); + LOG.info("Connected to master at " + masterIsa); this.hbaseMaster = master; return masterServerName; } @@ -2819,7 +2820,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, if (r != null) { this.metrics.regionAccessCounter.update(encodedRegionName); } - + return r; } -- 1.7.9.6 (Apple Git-31.1)