You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2009/05/04 21:14:12 UTC
svn commit: r771408 - in /hadoop/hbase/branches/0.19: CHANGES.txt
src/java/org/apache/hadoop/hbase/HServerInfo.java
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
src/test/org/apache/hadoop/hbase/TestSerialization.java
Author: jdcryans
Date: Mon May 4 19:14:12 2009
New Revision: 771408
URL: http://svn.apache.org/viewvc?rev=771408&view=rev
Log:
HBASE-1368 HBASE-1279 broke the build
Modified:
hadoop/hbase/branches/0.19/CHANGES.txt
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/HServerInfo.java
hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/TestSerialization.java
Modified: hadoop/hbase/branches/0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/CHANGES.txt?rev=771408&r1=771407&r2=771408&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.19/CHANGES.txt Mon May 4 19:14:12 2009
@@ -22,6 +22,7 @@
(Ryan Rawson via Stack)
HBASE-1352 incrementColumnValue/Memcache bug
HBASE-1279 Fix the way hostnames and IPs are handled
+ HBASE-1368 HBASE-1279 broke the build
Release 0.19.1 - 03/19/2009
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/HServerInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/HServerInfo.java?rev=771408&r1=771407&r2=771408&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/HServerInfo.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/HServerInfo.java Mon May 4 19:14:12 2009
@@ -42,7 +42,8 @@
/** default constructor - used by Writable */
public HServerInfo() {
- this(new HServerAddress(), 0, HConstants.DEFAULT_REGIONSERVER_INFOPORT);
+ this(new HServerAddress(), 0,
+ HConstants.DEFAULT_REGIONSERVER_INFOPORT, "default name");
}
/**
@@ -52,11 +53,12 @@
* @param infoPort Port the info server is listening on.
*/
public HServerInfo(HServerAddress serverAddress, long startCode,
- final int infoPort) {
+ final int infoPort, String name) {
this.serverAddress = serverAddress;
this.startCode = startCode;
this.load = new HServerLoad();
this.infoPort = infoPort;
+ this.name = name;
}
/**
Modified: hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=771408&r1=771407&r2=771408&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/branches/0.19/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Mon May 4 19:14:12 2009
@@ -274,16 +274,16 @@
address.getPort(), conf.getInt("hbase.regionserver.handler.count", 10),
false, conf);
this.server.setErrorHandler(this);
+ String machineName = DNS.getDefaultHost(
+ conf.get("hbase.regionserver.dns.interface","default"),
+ conf.get("hbase.regionserver.dns.nameserver","default"));
// Address is givin a default IP for the moment. Will be changed after
// calling the master.
this.serverInfo = new HServerInfo(new HServerAddress(
new InetSocketAddress(address.getBindAddress(),
this.server.getListenerAddress().getPort())), System.currentTimeMillis(),
- this.conf.getInt("hbase.regionserver.info.port", 60030));
- String machineName = DNS.getDefaultHost(
- conf.get("hbase.regionserver.dns.interface","default"),
- conf.get("hbase.regionserver.dns.nameserver","default"));
- this.serverInfo.setName(machineName);
+ this.conf.getInt("hbase.regionserver.info.port", 60030), machineName);
+
if (this.serverInfo.getServerAddress() == null) {
throw new NullPointerException("Server address cannot be null; " +
"hbase-958 debugging");
Modified: hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/TestSerialization.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/TestSerialization.java?rev=771408&r1=771407&r2=771408&view=diff
==============================================================================
--- hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/TestSerialization.java (original)
+++ hadoop/hbase/branches/0.19/src/test/org/apache/hadoop/hbase/TestSerialization.java Mon May 4 19:14:12 2009
@@ -125,7 +125,7 @@
*/
public void testServerInfo() throws Exception {
HServerInfo hsi = new HServerInfo(new HServerAddress("0.0.0.0:123"), -1,
- 1245);
+ 1245, "default name");
byte [] b = Writables.getBytes(hsi);
HServerInfo deserializedHsi =
(HServerInfo)Writables.getWritable(b, new HServerInfo());