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 2009/08/02 06:55:42 UTC
svn commit: r799991 - in /hadoop/hbase/trunk: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: stack
Date: Sun Aug 2 04:55:41 2009
New Revision: 799991
URL: http://svn.apache.org/viewvc?rev=799991&view=rev
Log:
HBASE-1732 Flag to disable regionserver restart
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=799991&r1=799990&r2=799991&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Sun Aug 2 04:55:41 2009
@@ -308,6 +308,7 @@
on reinit
HBASE-1725 Old TableMap interface's definitions are not generic enough
(DoÄacan Güney via Stack)
+ HBASE-1732 Flag to disable regionserver restart
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
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=799991&r1=799990&r2=799991&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 Sun Aug 2 04:55:41 2009
@@ -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 {
+ abort();
+ }
} else if (type == EventType.NodeDeleted) {
watchMasterAddress();
} else if (type == EventType.NodeCreated) {