You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/08/25 07:30:37 UTC
svn commit: r1377216 -
/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Sat Aug 25 05:30:36 2012
New Revision: 1377216
URL: http://svn.apache.org/viewvc?rev=1377216&view=rev
Log:
HBASE-6662 Region server incorrectly reports its own address as master's address
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1377216&r1=1377215&r2=1377216&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Sat Aug 25 05:30:36 2012
@@ -1612,6 +1612,7 @@ public class HRegionServer implements HR
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 HR
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 HR
// 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 HR
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 HR
if (r != null) {
this.metrics.regionAccessCounter.update(encodedRegionName);
}
-
+
return r;
}