svn commit: r799990 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/HColumnDescriptor.java src/java/org/apache/hadoop/hbase/HTableDescriptor.java src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[stack]

Author: stack
Date: Sun Aug  2 04:53:46 2009
New Revision: 799990

URL: http://svn.apache.org/viewvc?rev=799990&view=rev
Log:
HBASE-1732 Flag to disable regionserver restart

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=799990&r1=799989&r2=799990&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Sun Aug  2 04:53:46 2009
@@ -309,6 +309,7 @@
    HBASE-1723  getRowWithColumnsTs changed behavior (Mathias Lehman via Stack)
    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/branches/0.20/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java?rev=799990&r1=799989&r2=799990&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
 Sun Aug  2 04:53:46 2009
@@ -54,6 +54,7 @@
   // Time-to-live feature.  Version 4 was when we moved to byte arrays, 
HBASE-82.
   // Version 5 was when bloom filter descriptors were removed.
   // Version 6 adds metadata as a map where keys and values are byte[].
+  // Version 7 -- add new compression and hfile blocksize to HColumnDescriptor 
(HBASE-1217)
   private static final byte COLUMN_DESCRIPTOR_VERSION = (byte)7;
 
   /** 

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=799990&r1=799989&r2=799990&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
 Sun Aug  2 04:53:46 2009
@@ -51,8 +51,8 @@
   // Changes prior to version 3 were not recorded here.
   // Version 3 adds metadata as a map where keys and values are byte[].
   // Version 4 adds indexes
-  // FIXME version 5 should remove indexes
-  public static final byte TABLE_DESCRIPTOR_VERSION = 4;
+  // Version 5 removed transactional pollution -- e.g. indexes
+  public static final byte TABLE_DESCRIPTOR_VERSION = 5;
 
   private byte [] name = HConstants.EMPTY_BYTE_ARRAY;
   private String nameAsString = "";

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=799990&r1=799989&r2=799990&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 (original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
 Sun Aug  2 04:53:46 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) {