svn commit: r1065812 - in /incubator/whirr/trunk: CHANGES.txt scripts/apache/zookeeper/install

[to...@apache.org]

Author: tomwhite
Date: Mon Jan 31 21:52:15 2011
New Revision: 1065812

URL: http://svn.apache.org/viewvc?rev=1065812&view=rev
Log:
WHIRR-183. ZooKeeper Data Directory Cleanup. Contributed by asavu.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/scripts/apache/zookeeper/install

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1065812&r1=1065811&r2=1065812&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Jan 31 21:52:15 2011
@@ -19,6 +19,8 @@ Trunk (unreleased changes)
     WHIRR-199. Add aliases for short role names like nn, jt, tt, dn, zk.
     (asavu via tomwhite)
 
+    WHIRR-183. ZooKeeper Data Directory Cleanup. (asavu via tomwhite)
+
   BUG FIXES
 
     WHIRR-170. Instances should be started in the order specified in 

Modified: incubator/whirr/trunk/scripts/apache/zookeeper/install
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/zookeeper/install?rev=1065812&r1=1065811&r2=1065812&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/zookeeper/install (original)
+++ incubator/whirr/trunk/scripts/apache/zookeeper/install Mon Jan 31 21:52:15 2011
@@ -29,6 +29,7 @@ ZK_VERSION=${1:-3.3.0}
 ZOOKEEPER_HOME=/usr/local/zookeeper-$ZK_VERSION
 ZK_CONF_DIR=/etc/zookeeper/conf
 ZK_LOG_DIR=/var/log/zookeeper
+ZK_DATA_DIR=$ZK_LOG_DIR/txlog
 
 zk_tar_url=http://www.apache.org/dist/hadoop/zookeeper/zookeeper-$ZK_VERSION/zookeeper-$ZK_VERSION.tar.gz
 zk_tar_file=`basename $zk_tar_url`
@@ -66,9 +67,16 @@ cp $ZOOKEEPER_HOME/conf/log4j.properties
 sed -i -e "s|log4j.rootLogger=INFO, CONSOLE|log4j.rootLogger=INFO, ROLLINGFILE|" \
        -e "s|log4j.appender.ROLLINGFILE.File=zookeeper.log|log4j.appender.ROLLINGFILE.File=$ZK_LOG_DIR/zookeeper.log|" \
     $ZK_CONF_DIR/log4j.properties
+
+# Install a CRON task for data directory cleanup
+ZK_JAR=$ZOOKEEPER_HOME/zookeeper-$ZK_VERSION.jar
+ZK_LOG4J_JAR=`echo $ZOOKEEPER_HOME/lib/log4j-*.jar`
+
+CRON="0 0 * * * java -cp $ZK_JAR:$ZK_LOG4J_JAR:$ZK_CONF_DIR org.apache.zookeeper.server.PurgeTxnLog $ZK_DATA_DIR $ZK_DATA_DIR -n 10"
+crontab -l 2>/dev/null | { cat; echo "$CRON"; } | sort | uniq | crontab -
     
 # Ensure ZooKeeper starts on boot
 sed -i -e "s/exit 0//" /etc/rc.local
 cat >> /etc/rc.local <<EOF
 ZOOCFGDIR=$ZK_CONF_DIR $ZOOKEEPER_HOME/bin/zkServer.sh start > /dev/null 2>&1 &
-EOF
\ No newline at end of file
+EOF