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
