commit 3e56c0d9a531baabe268c9c12266f6a7fa8e92e0 Author: todd Date: Tue Apr 13 18:24:02 2010 -0700 HBASE-2441. ZK failures early in RS startup cause infinite busy loop diff --git src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 578d310..a5799f5 100644 --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -1260,7 +1260,10 @@ public class HRegionServer implements HConstants, HRegionInterface, public void abort() { this.abortRequested = true; this.reservedSpace.clear(); - LOG.info("Dump of metrics: " + this.metrics.toString()); + if (metrics != null) { + // metrics may not be initialized yet + LOG.info("Dump of metrics: " + this.metrics.toString()); + } stop(); } @@ -1334,7 +1337,7 @@ public class HRegionServer implements HConstants, HRegionInterface, LOG.debug("sending initial server load: " + hsl); lastMsg = System.currentTimeMillis(); boolean startCodeOk = false; - while(!startCodeOk) { + while(!startCodeOk && !stopRequested.get()) { serverInfo.setStartCode(System.currentTimeMillis()); startCodeOk = zooKeeperWrapper.writeRSLocation(this.serverInfo); if(!startCodeOk) {