ZOOKEEPER-447. zkServer.sh doesn't allow different config files to be specified on the command line

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

CHANGES.txt

@@ -38,8 +38,11 @@ BUGFIXES:
   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

bin/zkEnv.sh

@@ -32,6 +32,13 @@ then
     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 @@ do
 done
 #add the zoocfg dir to classpath
 CLASSPATH=$ZOOCFGDIR:$CLASSPATH
-ZOOCFG="$ZOOCFGDIR/zoo.cfg"

bin/zkServer.sh

@@ -53,6 +53,12 @@ ZOOBINDIR=`dirname "$ZOOBIN"`
 
 . $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