Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add startLocalCluster.sh option --ongoing-ports

This commit is contained in:
Mark Volmary 2017-06-09 16:20:42 +02:00
parent b334a6132c
commit b5f69f9ca4
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/cluster-run-common.sh
View File

@ -19,6 +19,7 @@ function help() {
echo " -r/--rocksdb-engine Use Rocksdb engine (default: false )" echo " -r/--rocksdb-engine Use Rocksdb engine (default: false )"
echo " -q/--source-dir ArangoDB source dir (default: .)" echo " -q/--source-dir ArangoDB source dir (default: .)"
echo " -B/--bin-dir ArangoDB binary dir (default: ./build)" echo " -B/--bin-dir ArangoDB binary dir (default: ./build)"
echo " -O/--ongoing-ports Ongoing ports (default: false)"
echo "" echo ""
echo "EXAMPLES:" echo "EXAMPLES:"
echo " $0" echo " $0"
@ -114,6 +115,10 @@ while [[ ${1} ]]; do
BUILD=${2} BUILD=${2}
shift shift
;; ;;
-O|--ongoing-ports)
ONGOING_PORTS=${2}
shift
;;
*) *)
echo "Unknown parameter: ${1}" >&2 echo "Unknown parameter: ${1}" >&2
help help

15
scripts/shutdownLocalCluster.sh
View File

@ -6,10 +6,17 @@ echo Number of Agents: $NRAGENTS
echo Number of DBServers: $NRDBSERVERS echo Number of DBServers: $NRDBSERVERS
echo Number of Coordinators: $NRCOORDINATORS echo Number of Coordinators: $NRCOORDINATORS
AG_BASE=$(( $PORT_OFFSET + 4001 )) if [ -z "$ONGOING_PORTS" ] ; then
CO_BASE=$(( $PORT_OFFSET + 8530 )) CO_BASE=$(( $PORT_OFFSET + 8530 ))
DB_BASE=$(( $PORT_OFFSET + 8629 )) DB_BASE=$(( $PORT_OFFSET + 8629 ))
SE_BASE=$(( $PORT_OFFSET + 8729 )) AG_BASE=$(( $PORT_OFFSET + 4001 ))
SE_BASE=$(( $PORT_OFFSET + 8729 ))
else
CO_BASE=$(( $PORT_OFFSET + 8530 ))
DB_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS ))
AG_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS + $NRDBSERVERS ))
SE_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS + $NRDBSERVERS + $NRAGENTS ))
fi
LOCALHOST="[::1]" LOCALHOST="[::1]"
ANY="[::]" ANY="[::]"

18
scripts/startLocalCluster.sh
View File

@ -28,9 +28,17 @@ fi
SFRE=1.0 SFRE=1.0
COMP=2000 COMP=2000
KEEP=1000 KEEP=1000
AG_BASE=$(( $PORT_OFFSET + 4001 )) if [ -z "$ONGOING_PORTS" ] ; then
CO_BASE=$(( $PORT_OFFSET + 8530 )) CO_BASE=$(( $PORT_OFFSET + 8530 ))
DB_BASE=$(( $PORT_OFFSET + 8629 )) DB_BASE=$(( $PORT_OFFSET + 8629 ))
AG_BASE=$(( $PORT_OFFSET + 4001 ))
SE_BASE=$(( $PORT_OFFSET + 8729 ))
else
CO_BASE=$(( $PORT_OFFSET + 8530 ))
DB_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS ))
AG_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS + $NRDBSERVERS ))
SE_BASE=$(( $PORT_OFFSET + 8530 + $NRCOORDINATORS + $NRDBSERVERS + $NRAGENTS ))
fi
NATH=$(( $NRDBSERVERS + $NRCOORDINATORS + $NRAGENTS )) NATH=$(( $NRDBSERVERS + $NRCOORDINATORS + $NRAGENTS ))
ENDPOINT=[::] ENDPOINT=[::]
ADDRESS=[::1] ADDRESS=[::1]
@ -183,8 +191,8 @@ done
if [ "$SECONDARIES" == "1" ] ; then if [ "$SECONDARIES" == "1" ] ; then
let index=1 let index=1
PORTTOPSE=`expr 8729 + $NRDBSERVERS - 1` PORTTOPSE=`expr $SE_BASE + $NRDBSERVERS - 1`
for PORT in `seq 8729 $PORTTOPSE` ; do for PORT in `seq $SE_BASE $PORTTOPSE` ; do
mkdir cluster/data$PORT mkdir cluster/data$PORT
CLUSTER_ID="Secondary$index" CLUSTER_ID="Secondary$index"