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 2008/10/30 05:49:21 UTC
svn commit: r709087 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase:
master/ProcessRegionOpen.java master/ServerManager.java
regionserver/HRegionServer.java
Author: stack
Date: Wed Oct 29 21:49:20 2008
New Revision: 709087
URL: http://svn.apache.org/viewvc?rev=709087&view=rev
Log:
HBASE-958 IllegalArgumentException: server cannot be null
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java?rev=709087&r1=709086&r2=709087&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java Wed Oct 29 21:49:20 2008
@@ -49,6 +49,10 @@
throws IOException {
super(master, regionInfo);
this.serverAddress = info.getServerAddress();
+ if (this.serverAddress == null) {
+ throw new NullPointerException("Server address cannot be null; " +
+ "hbase-958 debugging");
+ }
this.startCode = Bytes.toBytes(info.getStartCode());
}
@@ -92,7 +96,7 @@
this.historian.addRegionOpen(regionInfo, serverAddress);
if (isMetaTable) {
// It's a meta region.
- MetaRegion m = new MetaRegion(serverAddress,
+ MetaRegion m = new MetaRegion(new HServerAddress(serverAddress),
regionInfo.getRegionName(), regionInfo.getStartKey());
if (!master.regionManager.isInitialMetaScanComplete()) {
// Put it on the queue to be scanned for the first time.
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=709087&r1=709086&r2=709087&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java Wed Oct 29 21:49:20 2008
@@ -334,7 +334,10 @@
ArrayList<HMsg> returnMsgs = new ArrayList<HMsg>();
Map<byte [], HRegionInfo> regionsToKill =
master.regionManager.removeMarkedToClose(serverName);
-
+ if (serverInfo.getServerAddress() == null) {
+ throw new NullPointerException("Server address cannot be null; " +
+ "hbase-958 debugging");
+ }
// Get reports on what the RegionServer did.
for (int i = 0; i < incomingMsgs.length; i++) {
HRegionInfo region = incomingMsgs[i].getRegionInfo();
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=709087&r1=709086&r2=709087&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Oct 29 21:49:20 2008
@@ -274,6 +274,10 @@
new InetSocketAddress(DEFAULT_HOST,
this.server.getListenerAddress().getPort())), System.currentTimeMillis(),
this.conf.getInt("hbase.regionserver.info.port", 60030));
+ if (this.serverInfo.getServerAddress() == null) {
+ throw new NullPointerException("Server address cannot be null; " +
+ "hbase-958 debugging");
+ }
this.numRegionsToReport =
conf.getInt("hbase.regionserver.numregionstoreport", 10);