svn commit: r932203 - in /hadoop/hbase/trunk: CHANGES.txt core/src/main/resources/hbase-default.xml

[ap...@apache.org]

Author: apurtell
Date: Fri Apr  9 00:48:28 2010
New Revision: 932203

URL: http://svn.apache.org/viewvc?rev=932203&view=rev
Log:
HBASE-2341 ZK settings for initLimit/syncLimit

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/core/src/main/resources/hbase-default.xml

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=932203&r1=932202&r2=932203&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Apr  9 00:48:28 2010
@@ -267,6 +267,8 @@ Release 0.21.0 - Unreleased
    HBASE-2335  mapred package docs don't say zookeeper jar is a dependent
    HBASE-2417  HCM.locateRootRegion fails hard on "Connection refused"
    HBASE-2346  Usage of FilterList slows down scans
+   HBASE-2341  ZK settings for initLimit/syncLimit should not have been removed
+               from hbase-default.xml
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/core/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/resources/hbase-default.xml?rev=932203&r1=932202&r2=932203&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/resources/hbase-default.xml (original)
+++ hadoop/hbase/trunk/core/src/main/resources/hbase-default.xml Fri Apr  9 00:48:28 2010
@@ -502,6 +502,21 @@
     </property>
   -->
   <property>
+    <name>hbase.zookeeper.property.initLimit</name>
+    <value>10</value>
+    <description>Property from ZooKeeper's config zoo.cfg.
+    The number of ticks that the initial synchronization phase can take.
+    </description>
+  </property>
+  <property>
+    <name>hbase.zookeeper.property.syncLimit</name>
+    <value>5</value>
+    <description>Property from ZooKeeper's config zoo.cfg.
+    The number of ticks that can pass between sending a request and getting an
+    acknowledgment.
+    </description>
+  </property>
+  <property>
     <name>hbase.zookeeper.property.dataDir</name>
     <value>${hbase.tmp.dir}/zookeeper</value>
     <description>Property from ZooKeeper's config zoo.cfg.