Index: src/main/java/org/apache/hadoop/hbase/HRegionLocation.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HRegionLocation.java (revision 1003879) +++ src/main/java/org/apache/hadoop/hbase/HRegionLocation.java (working copy) @@ -45,7 +45,7 @@ @Override public String toString() { return "address: " + this.serverAddress.toString() + ", regioninfo: " + - this.regionInfo; + this.regionInfo.getRegionNameAsString(); } /** Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1003879) +++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -539,7 +539,7 @@ } // for } catch (Throwable t) { if (!checkOOME(t)) { - abort("Unhandled exception", t); + abort("Unhandled exception: " + t.getMessage(), t); } } this.leases.closeAfterLeasesExpire(); @@ -1247,9 +1247,9 @@ */ public void abort(String reason, Throwable cause) { if (cause != null) { - LOG.fatal("Aborting region server " + this + ": " + reason, cause); + LOG.fatal("ABORTING region server " + this + ": " + reason, cause); } else { - LOG.fatal("Aborting region server " + this + ": " + reason); + LOG.fatal("ABORTING region server " + this + ": " + reason); } this.abortRequested = true; this.reservedSpace.clear(); @@ -1358,9 +1358,9 @@ try { this.requestCount.set(0); lastMsg = System.currentTimeMillis(); - ZKUtil.setAddressAndWatch(zooKeeper, ZKUtil.joinZNode( - zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)), - this.serverInfo.getServerAddress()); + ZKUtil.setAddressAndWatch(zooKeeper, + ZKUtil.joinZNode(zooKeeper.rsZNode, ZKUtil.getNodeName(serverInfo)), + this.serverInfo.getServerAddress()); this.serverInfo.setLoad(buildServerLoad()); result = this.hbaseMaster.regionServerStartup(this.serverInfo); break; Index: src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (revision 1003879) +++ src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (working copy) @@ -60,7 +60,7 @@ this.server = server; this.services = services; this.deadServers = deadServers; - if (this.deadServers.contains(hsi.getServerName())) { + if (!this.deadServers.contains(hsi.getServerName())) { LOG.warn(hsi.getServerName() + " is NOT in deadservers; it should be!"); } } Index: src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1003879) +++ src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy) @@ -382,8 +382,7 @@ throw e; } } - LOG.info("Failed verification of " + Bytes.toString(regionName) + - ", assigning anew: " + t); + LOG.info("Failed verification of " + Bytes.toString(regionName) + "; " + t); return false; } Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1003879) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -594,7 +594,7 @@ MetaScanner.metaScan(conf, visitor, tableName, row, this.prefetchRegionLimit); } catch (IOException e) { - LOG.warn("Encounted problems when prefetch META table: ", e); + LOG.warn("Encountered problems when prefetch META table: ", e); } } @@ -627,9 +627,10 @@ + Bytes.toStringBinary(row) + " after " + numRetries + " tries."); } + HRegionLocation metaLocation = null; try { // locate the root or meta region - HRegionLocation metaLocation = locateRegion(parentTable, metaKey); + metaLocation = locateRegion(parentTable, metaKey); HRegionInterface server = getHRegionConnection(metaLocation.getServerAddress()); @@ -714,7 +715,10 @@ } if (tries < numRetries - 1) { if (LOG.isDebugEnabled()) { - LOG.debug("locateRegionInMeta attempt " + tries + " of " + + LOG.debug("locateRegionInMeta parentTable=" + + Bytes.toString(parentTable) + ", metaLocation=" + + ((metaLocation == null)? "null": metaLocation) + ", attempt=" + + tries + " of " + this.numRetries + " failed; retrying after sleep of " + getPauseTime(tries) + " because: " + e.getMessage()); } @@ -731,7 +735,8 @@ Thread.sleep(getPauseTime(tries)); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new IOException("Giving up trying to location region in meta: thread is interrupted."); + throw new IOException("Giving up trying to location region in " + + "meta: thread is interrupted."); } } }