ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@802964 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -60,6 +60,9 @@ BUGFIXES:
   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)

bin/zkCleanup.sh

@@ -36,8 +36,16 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . $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 $ZOODATADIR $*
+else
+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 $ZOODATALOGDIR $ZOODATADIR $*
+fi