svn commit: r1412629 - in /zookeeper/bookkeeper/trunk: CHANGES.txt hedwig-client/src/main/cpp/scripts/server-control.sh

[iv...@apache.org]

Author: ivank
Date: Thu Nov 22 17:36:20 2012
New Revision: 1412629

URL: http://svn.apache.org/viewvc?rev=1412629&view=rev
Log:
BOOKKEEPER-454: hedwig c++ tester script assumes sh is bash (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/scripts/server-control.sh

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1412629&r1=1412628&r2=1412629&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Thu Nov 22 17:36:20 2012
@@ -128,6 +128,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-452: Rename ClientConfiguration multiplexing_enabled to subscription_connection_sharing_enabled (sijie via ivank)
 
+        BOOKKEEPER-454: hedwig c++ tester script assumes sh is bash (ivank)
+
       hedwig-server:
 
         BOOKKEEPER-302: No more messages delivered when hub server scans messages over two ledgers. (sijie via ivank)

Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/scripts/server-control.sh
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/scripts/server-control.sh?rev=1412629&r1=1412628&r2=1412629&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/scripts/server-control.sh (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/scripts/server-control.sh Thu Nov 22 17:36:20 2012
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -25,7 +25,7 @@ ZKCLIENT=org.apache.zookeeper.ZooKeeperM
 check_bk_down() {
     NUM_UP=100
     for i in 0 1 2 3 4 5 6 7 8 9; do
-	NUM_UP=`sh $BKSCRIPT $ZKCLIENT ls /ledgers/available 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
+	NUM_UP=`$BKSCRIPT $ZKCLIENT ls /ledgers/available 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
 	if [ $NUM_UP == 0 ]; then
 	    break;
 	fi
@@ -42,7 +42,7 @@ check_bk_up() {
     NUM_BOOKIES=$1
     NUM_UP=0
     for i in 0 1 2 3 4 5 6 7 8 9; do
-	NUM_UP=`sh $BKSCRIPT $ZKCLIENT ls /ledgers/available 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
+	NUM_UP=`$BKSCRIPT $ZKCLIENT ls /ledgers/available 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
 	if [ $NUM_UP == $NUM_BOOKIES ]; then
 	    break;
 	fi
@@ -59,7 +59,7 @@ check_hw_down() {
     REGION=$1
     NUM_UP=100
     for i in 0 1 2 3 4 5 6 7 8 9; do
-	NUM_UP=`sh $BKSCRIPT $ZKCLIENT ls /hedwig/$REGION/hosts 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
+	NUM_UP=`$BKSCRIPT $ZKCLIENT ls /hedwig/$REGION/hosts 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
 	if [ $NUM_UP == 0 ]; then
 	    break;
 	fi
@@ -77,7 +77,7 @@ check_hw_up() {
     NUM_SERVERS=$2
     NUM_UP=0
     for i in 0 1 2 3 4 5 6 7 8 9; do
-	NUM_UP=`sh $BKSCRIPT $ZKCLIENT ls /hedwig/$REGION/hosts 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
+	NUM_UP=`$BKSCRIPT $ZKCLIENT ls /hedwig/$REGION/hosts 2> /dev/null | awk 'BEGIN{SERVERS=0} /^\[/ { gsub(/[,\[\]]/, ""); SERVERS=NF} END{ print SERVERS }'`
 	if [ $NUM_UP == $NUM_SERVERS ]; then
 	    break;
 	fi
@@ -132,7 +132,7 @@ cert_path=$PWD/../../../../../hedwig-ser
 password=eUySvp2phM2Wk
 region=$REGION
 EOF
-    sh $HWSCRIPT server 2>&1 > hwoutput.$COUNT.log &
+    $HWSCRIPT server 2>&1 > hwoutput.$COUNT.log &
     echo $! > hwprocess.$COUNT.pid
 }
 
@@ -141,7 +141,7 @@ start_cluster() {
 	stop_cluster;
     fi
 
-    sh $BKSCRIPT localbookie 3 2>&1 > bkoutput.log &
+    $BKSCRIPT localbookie 3 2>&1 > bkoutput.log &
     echo $! > bkprocess.pid
     check_bk_up 3