You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2009/10/22 20:42:25 UTC

svn commit: r828811 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java

Author: jdcryans
Date: Thu Oct 22 18:42:25 2009
New Revision: 828811

URL: http://svn.apache.org/viewvc?rev=828811&view=rev
Log:
HBASE-1929  If hbase-default.xml is not in CP, zk session timeout is 10 secs

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=828811&r1=828810&r2=828811&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Thu Oct 22 18:42:25 2009
@@ -18,6 +18,7 @@
    HBASE-1777  column length is not checked before saved to memstore
    HBASE-1895  HConstants.MAX_ROW_LENGTH is incorrectly 64k, should be 32k
    HBASE-1925  IllegalAccessError: Has not been initialized (getMaxSequenceId)
+   HBASE-1929  If hbase-default.xml is not in CP, zk session timeout is 10 secs!
 
   IMPROVEMENTS
    HBASE-1899  Use scanner caching in shell count

Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java?rev=828811&r1=828810&r2=828811&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java Thu Oct 22 18:42:25 2009
@@ -82,7 +82,7 @@
                             ZOOKEEPER_CONFIG_NAME);
     }
 
-    int sessionTimeout = conf.getInt("zookeeper.session.timeout", 10 * 1000);
+    int sessionTimeout = conf.getInt("zookeeper.session.timeout", 60 * 1000);
     try {
       zooKeeper = new ZooKeeper(quorumServers, sessionTimeout, watcher);
     } catch (IOException e) {