hadoop-zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r802964 - in /hadoop/zookeeper/trunk: CHANGES.txt bin/zkCleanup.sh
Date Tue, 11 Aug 2009 00:28:06 GMT
Author: mahadev
Date: Tue Aug 11 00:28:06 2009
New Revision: 802964

URL: http://svn.apache.org/viewvc?rev=802964&view=rev
Log:
ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev)

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/bin/zkCleanup.sh

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=802964&r1=802963&r2=802964&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Tue Aug 11 00:28:06 2009
@@ -60,6 +60,9 @@
   ZOOKEEPER-499. electionAlg should default to FLE (3) - regression (phunt via
   mahadev) 
 
+  ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev)
+
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

Modified: hadoop/zookeeper/trunk/bin/zkCleanup.sh
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkCleanup.sh?rev=802964&r1=802963&r2=802964&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/bin/zkCleanup.sh (original)
+++ hadoop/zookeeper/trunk/bin/zkCleanup.sh Tue Aug 11 00:28:06 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



Mime
View raw message