Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 61137 invoked from network); 11 Aug 2009 00:28:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Aug 2009 00:28:27 -0000 Received: (qmail 2216 invoked by uid 500); 11 Aug 2009 00:28:34 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 2189 invoked by uid 500); 11 Aug 2009 00:28:34 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 2179 invoked by uid 99); 11 Aug 2009 00:28:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2009 00:28:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2009 00:28:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A8EE82388878; Tue, 11 Aug 2009 00:28:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r802964 - in /hadoop/zookeeper/trunk: CHANGES.txt bin/zkCleanup.sh Date: Tue, 11 Aug 2009 00:28:06 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090811002806.A8EE82388878@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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