openstack
/
tooz
Code Issues Proposed changes

Only start zookeeper/memcached when not already running 

Since openstack infra already runs these services (or will)
we should just use them when we can. Also for developers that
already have these services running we should use them when
we can instead of trying to recreate them.

Change-Id: I8655e5365ad36c57836f87e147102e2d02db7830
This commit is contained in:
Joshua Harlow 2014-09-15 17:00:00 -07:00
parent 3981a3a300
commit 0046b270ab
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup-test-env.sh
View File

@ -5,16 +5,20 @@ ZOO_CONF=/etc/zookeeper
ZOO_DIR=/usr/share/zookeeper
ZOO_BIN=$ZOO_DIR/bin
ZOO_TMP_DIR=$(mktemp -d /tmp/ZOO-TMP-XXXXX)
ZOOKEEPER_STARTED=0
mkdir $ZOO_TMP_DIR/bin
function clean_exit(){
local error_code="$?"
if [ -d $ZOO_CONF ]; then
if [ -d $ZOO_CONF ] && [ $ZOOKEEPER_STARTED -eq 1 ]; then
stop_zookeeper_server
fi
rm -rf ${ZOO_TMP_DIR}
kill $(jobs -p)
local spawned=$(jobs -p)
if [ -n "$spawned" ]; then
kill $(jobs -p)
fi
return $error_code
}
@ -38,18 +42,27 @@ function start_zookeeper_server(){
}
function stop_zookeeper_server(){
function check_port(){
netstat -an 2>/dev/null | grep -q "$1"
return $?
}
function stop_zookeeper_server(){
$ZOO_TMP_DIR/bin/zkServer.sh stop
}
trap "clean_exit" EXIT
if [ -d $ZOO_CONF ]; then
if ! check_port 2181 && [ -d $ZOO_CONF ]; then
start_zookeeper_server
if [ $? -eq 0 ]; then
ZOOKEEPER_STARTED=1
fi
fi
memcached &
if ! check_port 11211; then
memcached &
fi
# Yield execution to venv command
$*