Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 71239 invoked from network); 4 Aug 2009 21:21:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 21:21:29 -0000 Received: (qmail 37720 invoked by uid 500); 4 Aug 2009 21:21:34 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 37694 invoked by uid 500); 4 Aug 2009 21:21: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 37684 invoked by uid 99); 4 Aug 2009 21:21:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 21:21: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, 04 Aug 2009 21:21:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7FE9F238886C; Tue, 4 Aug 2009 21:21:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800981 - in /hadoop/zookeeper/trunk: CHANGES.txt bin/zkEnv.sh bin/zkServer.sh Date: Tue, 04 Aug 2009 21:21:04 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090804212104.7FE9F238886C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: phunt Date: Tue Aug 4 21:21:02 2009 New Revision: 800981 URL: http://svn.apache.org/viewvc?rev=800981&view=rev Log: ZOOKEEPER-447. zkServer.sh doesn't allow different config files to be specified on the command line Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/bin/zkEnv.sh hadoop/zookeeper/trunk/bin/zkServer.sh Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=800981&r1=800980&r2=800981&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Tue Aug 4 21:21:02 2009 @@ -38,8 +38,11 @@ ZOOKEEPER-480. FLE should perform leader check when node is not leading and add vote of follower (flavio via mahadev) - ZOOKEEPER-491. Prevent zero-weight servers from being elected. (flavio via - mahadev) + ZOOKEEPER-491. Prevent zero-weight servers from being elected. + (flavio via mahadev) + + ZOOKEEPER-447. zkServer.sh doesn't allow different config files to be + specified on the command line (henry robinson via phunt) IMPROVEMENTS: ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to Modified: hadoop/zookeeper/trunk/bin/zkEnv.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkEnv.sh?rev=800981&r1=800980&r2=800981&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkEnv.sh (original) +++ hadoop/zookeeper/trunk/bin/zkEnv.sh Tue Aug 4 21:21:02 2009 @@ -32,6 +32,13 @@ fi fi +if [ "x$ZOOCFG" = "x" ] +then + ZOOCFG="zoo.cfg" +fi + +ZOOCFG="$ZOOCFGDIR/$ZOOCFG" + if [ -e "$ZOOCFGDIR/java.env" ] then . "$ZOOCFGDIR/java.env" @@ -64,4 +71,3 @@ done #add the zoocfg dir to classpath CLASSPATH=$ZOOCFGDIR:$CLASSPATH -ZOOCFG="$ZOOCFGDIR/zoo.cfg" Modified: hadoop/zookeeper/trunk/bin/zkServer.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=800981&r1=800980&r2=800981&view=diff ============================================================================== --- hadoop/zookeeper/trunk/bin/zkServer.sh (original) +++ hadoop/zookeeper/trunk/bin/zkServer.sh Tue Aug 4 21:21:02 2009 @@ -53,6 +53,12 @@ . $ZOOBINDIR/zkEnv.sh +if [ "x$2" != "x" ] +then + ZOOCFG=$ZOOCFGDIR/$2 +fi +echo "Using config: $ZOOCFG" + ZOOPIDFILE=$(grep dataDir $ZOOCFG | sed -e 's/.*=//')/zookeeper_server.pid