Author: phunt Date: Tue Aug 4 21:23:06 2009 New Revision: 800983 URL: http://svn.apache.org/viewvc?rev=800983&view=rev Log: ZOOKEEPER-447. zkServer.sh doesn't allow different config files to be specified on the command line
Modified: hadoop/zookeeper/branches/branch-3.2/CHANGES.txt hadoop/zookeeper/branches/branch-3.2/bin/zkEnv.sh hadoop/zookeeper/branches/branch-3.2/bin/zkServer.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=800983&r1=800982&r2=800983&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.2/CHANGES.txt (original) +++ hadoop/zookeeper/branches/branch-3.2/CHANGES.txt Tue Aug 4 21:23:06 2009 @@ -35,8 +35,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: Modified: hadoop/zookeeper/branches/branch-3.2/bin/zkEnv.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/bin/zkEnv.sh?rev=800983&r1=800982&r2=800983&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.2/bin/zkEnv.sh (original) +++ hadoop/zookeeper/branches/branch-3.2/bin/zkEnv.sh Tue Aug 4 21:23:06 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/branches/branch-3.2/bin/zkServer.sh URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/bin/zkServer.sh?rev=800983&r1=800982&r2=800983&view=diff ============================================================================== --- hadoop/zookeeper/branches/branch-3.2/bin/zkServer.sh (original) +++ hadoop/zookeeper/branches/branch-3.2/bin/zkServer.sh Tue Aug 4 21:23:06 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