svn commit: r785850 - in /hadoop/hbase/trunk: CHANGES.txt build.xml src/test/zoo.cfg

[st...@apache.org]

Author: stack
Date: Wed Jun 17 23:02:18 2009
New Revision: 785850

URL: http://svn.apache.org/viewvc?rev=785850&view=rev
Log:
HBASE-1529 prevent aborts due to missing zoo.cfg

Added:
    hadoop/hbase/trunk/src/test/zoo.cfg
Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/build.xml

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=785850&r1=785849&r2=785850&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Jun 17 23:02:18 2009
@@ -357,6 +357,7 @@
                come up (Jonathan Gray via Stack)
    HBASE-1538  Up zookeeper timeout from 10 seconds to 30 seconds to cut down
                on hbase-user traffic
+   HBASE-1539  prevent aborts due to missing zoo.cfg
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

Modified: hadoop/hbase/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=785850&r1=785849&r2=785850&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Wed Jun 17 23:02:18 2009
@@ -165,6 +165,7 @@
     <jar jarfile="${jarfile}"
         basedir="${build.classes}" >
       <fileset file="${basedir}/conf/hbase-default.xml"/>
+      <fileset file="${basedir}/conf/zoo.cfg"/>
       <zipfileset dir="${build.webapps}" prefix="webapps"/>
    		<manifest>
             <attribute name="Main-Class" value="org/apache/hadoop/hbase/mapred/Driver" />

Added: hadoop/hbase/trunk/src/test/zoo.cfg
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/zoo.cfg?rev=785850&view=auto
==============================================================================
--- hadoop/hbase/trunk/src/test/zoo.cfg (added)
+++ hadoop/hbase/trunk/src/test/zoo.cfg Wed Jun 17 23:02:18 2009
@@ -0,0 +1,14 @@
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial 
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between 
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+dataDir=${hbase.tmp.dir}/zookeeper
+# the port at which the clients will connect
+clientPort=2181
+
+server.0=localhost:2888:3888