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 2010/05/08 08:00:39 UTC
svn commit: r942315 - in
/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase:
HServerInfo.java master/HMaster.java
Author: stack
Date: Sat May 8 06:00:39 2010
New Revision: 942315
URL: http://svn.apache.org/viewvc?rev=942315&view=rev
Log:
HBASE-2413 Master does not respect generation stamps, may result in meta getting permanently offlined
Modified:
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HServerInfo.java
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HServerInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HServerInfo.java?rev=942315&r1=942314&r2=942315&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HServerInfo.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HServerInfo.java Sat May 8 06:00:39 2010
@@ -76,7 +76,7 @@ public class HServerInfo implements Writ
this.startCode = other.getStartCode();
this.load = other.getLoad();
this.infoPort = other.getInfoPort();
- this.hostname = other.getHostName();
+ this.hostname = other.hostname;
}
public HServerLoad getLoad() {
@@ -113,10 +113,6 @@ public class HServerInfo implements Writ
this.serverName = null;
}
- public String getHostName() {
- return hostname;
- }
-
/**
* @return Server name made of the concatenation of hostname, port and
* startcode formatted as <code><hostname> ',' <port> ',' <startcode></code>
Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=942315&r1=942314&r2=942315&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/HMaster.java Sat May 8 06:00:39 2010
@@ -498,7 +498,7 @@ public class HMaster extends Thread impl
HRegionInterface hri =
this.connection.getHRegionConnection(address, false);
HServerInfo info = hri.getHServerInfo();
- LOG.debug("Inspection found server " + info.getHostName());
+ LOG.debug("Inspection found server " + info.getServerName());
serverManager.recordNewServer(info, true);
HRegionInfo[] regions = hri.getRegionsAssignment();
for (HRegionInfo region : regions) {