Index: src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 799799) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -355,7 +355,7 @@ EventType type = event.getType(); KeeperState state = event.getState(); LOG.info("Got ZooKeeper event, state: " + state + ", type: " + - type + ", path: " + event.getPath()); + type + ", path: " + event.getPath()); // Ignore events if we're shutting down. if (stopRequested.get()) { @@ -365,7 +365,13 @@ if (state == KeeperState.Expired) { LOG.error("ZooKeeper session expired"); - restart(); + boolean restart = + this.conf.getBoolean("hbase.regionserver.restart.on.zk.expire", false); + if (restart) { + restart(); + } else { + stop(); + } } else if (type == EventType.NodeDeleted) { watchMasterAddress(); } else if (type == EventType.NodeCreated) {