Index: src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (revision 999511)
+++ src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (working copy)
@@ -111,7 +111,7 @@
String deadServersList = deadservers.toString();
LOG.info("regionservers=" + numServers +
", averageload=" + StringUtils.limitDecimalTo2(averageLoad) +
- ((numDeadServers > 0)? ("deadservers=" + deadServersList): ""));
+ ((numDeadServers > 0)? (", deadservers=" + deadServersList): ""));
}
}
Index: src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (revision 999511)
+++ src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java (working copy)
@@ -232,7 +232,8 @@
/**
* @param data A .META. table row.
- * @return A pair of the regioninfo and the server address from data.
+ * @return A pair of the regioninfo and the server address from data
+ * (or null for server address if no address set in .META.).
* @throws IOException
*/
public static Pair metaRowToRegionPair(
@@ -410,7 +411,10 @@
while((result = metaServer.next(scannerid)) != null) {
if (result != null && result.size() > 0) {
Pair pair = metaRowToRegionPair(result);
- if (!pair.getSecond().equals(hsi.getServerAddress())) continue;
+ if (pair.getSecond() == null ||
+ !pair.getSecond().equals(hsi.getServerAddress())) {
+ continue;
+ }
hris.put(pair.getFirst(), result);
}
}