You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/09/07 07:50:49 UTC
svn commit: r1381888 - in /zookeeper/bookkeeper/branches/branch-4.1:
CHANGES.txt bookkeeper-server/bin/bookkeeper-daemon.sh
Author: sijie
Date: Fri Sep 7 05:50:49 2012
New Revision: 1381888
URL: http://svn.apache.org/viewvc?rev=1381888&view=rev
Log:
BOOKKEEPER-372: Check service name in bookie start/stop script. (nijel via sjie)
Modified:
zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/bin/bookkeeper-daemon.sh
Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt?rev=1381888&r1=1381887&r2=1381888&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt Fri Sep 7 05:50:49 2012
@@ -38,6 +38,8 @@ Release 4.1.1 - UNRELEASED
BOOKKEEPER-296: It's better provide stop script for bookie (nijel via sijie)
+ BOOKKEEPER-372: Check service name in bookie start/stop script. (nijel via sjie)
+
Release 4.1.0 - 2012-06-07
Non-backward compatible changes:
Modified: zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/bin/bookkeeper-daemon.sh
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/bin/bookkeeper-daemon.sh?rev=1381888&r1=1381887&r2=1381888&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/bin/bookkeeper-daemon.sh (original)
+++ zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-server/bin/bookkeeper-daemon.sh Fri Sep 7 05:50:49 2012
@@ -18,8 +18,16 @@
# * limitations under the License.
# */
-usage="Usage: bookkeeper-daemon.sh (start|stop) <command> <args...>"
-supportedargs="Supported args : -force (accepted only with stop command) - Decides whether to stop the Bookie Server forcefully if not stopped by normal shutdown"
+usage() {
+ cat <<EOF
+Usage: bookkeeper-daemon.sh (start|stop) <command> <args...>
+where command is one of:
+ bookie Run the bookie server
+
+where argument is one of:
+ -force (accepted only with stop command): Decides whether to stop the Bookie Server forcefully if not stopped by normal shutdown
+EOF
+}
BINDIR=`dirname "$0"`
BK_HOME=`cd $BINDIR/..;pwd`
@@ -37,11 +45,29 @@ BOOKIE_STOP_TIMEOUT=${BOOKIE_STOP_TIMEOU
BOOKIE_PID_DIR=${BOOKIE_PID_DIR:-$BK_HOME/bin}
+if [ $# -lt 2 ]
+then
+ echo "Error: no enough arguments provided."
+ usage
+ exit 1
+fi
+
startStop=$1
shift
command=$1
shift
+case $command in
+ (bookie)
+ echo "doing $startStop $command ..."
+ ;;
+ (*)
+ echo "Error: unknown service name $command"
+ usage
+ exit 1
+ ;;
+esac
+
export BOOKIE_LOG_DIR=$BOOKIE_LOG_DIR
export BOOKIE_ROOT_LOGGER=$BOOKIE_ROOT_LOGGER
export BOOKIE_LOG_FILE=bookkeeper-$command-$HOSTNAME.log
@@ -139,7 +165,7 @@ case $startStop in
;;
(*)
- echo $usage
+ usage
echo $supportedargs
exit 1
;;