Author: mahadev Date: Tue Aug 11 00:30:01 2009 New Revision: 802965 URL: http://svn.apache.org/viewvc?rev=802965&view=rev Log: ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev)
Modified: hadoop/zookeeper/branches/branch-3.2/CHANGES.txt hadoop/zookeeper/branches/branch-3.2/bin/zkCleanup.sh Modified: hadoop/zookeeper/branches/branch-3.2/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/CHANGES.txt?rev=802965&r1=802964&r2=802965&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.2/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.2/CHANGES.txt Tue Aug 11 00:30:01 2009 @@ -56,6 +56,8 @@ ZOOKEEPER-499. electionAlg should default to FLE (3) - regression (phunt via mahadev) + ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev) + IMPROVEMENTS: NEW FEATURES: Modified: hadoop/zookeeper/branches/branch-3.2/bin/zkCleanup.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/bin/zkCleanup.sh?rev=802965&r1=802964&r2=802965&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.2/bin/zkCleanup.sh (original) +++ hadoop/zookeeper/branches/branch-3.2/bin/zkCleanup.sh Tue Aug 11 00:30:01 2009 @@ -36,8 +36,16 @@ . $ZOOBINDIR/zkEnv.sh -eval `grep -e "^dataDir=" $ZOOCFG` +ZOODATADIR=$(grep '^dataDir=' $ZOOCFG | sed -e 's/.*=//') +ZOODATALOGDIR=$(grep '^dataLogDir=' $ZOOCFG | sed -e 's/.*=//') -java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ +if [ "x${ZOODATALOGDIR}" = "x" ] +then +echo java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ -cp $CLASSPATH $JVMFLAGS \ - org.apache.zookeeper.server.PurgeTxnLog $dataDir + org.apache.zookeeper.server.PurgeTxnLog $ZOODATADIR $* +else +echo java "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \ + -cp $CLASSPATH $JVMFLAGS \ + org.apache.zookeeper.server.PurgeTxnLog $ZOODATALOGDIR $ZOODATADIR $* +fi