openstack/devstack
Code Issues Proposed changes

Merge "Revert "Build retry loop for screen sessions""

Browse Source
This commit is contained in:
Jenkins 2014-06-28 16:00:33 +00:00 committed by Gerrit Code Review
commit e33379658f
1 changed files with 28 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
functions-common
View File

@ -1058,100 +1058,44 @@ function run_process {
echo $! echo $!
} }
function _start_in_screen {
local service=$1
local cmd=$2
local screen_name=${SCREEN_NAME:-stack}
local status_dir=${SERVICE_DIR:-${DEST}/status}
local service_dir="$status_dir/$screen_name"
local pid="$service_dir/$service.pid"
local failure="$service_dir/$service.failure"
if [[ -n ${SCREEN_LOGDIR} ]]; then
local logfile=${SCREEN_LOGDIR}/screen-${service}.${CURRENT_LOG_TIME}.log
local shortlog=${SCREEN_LOGDIR}/screen-${service}.log
# this whole dance is done because of slow nodes
screen -S $screen_name -p $service -X logfile ${logfile}
screen -S $screen_name -p $service -X log on
ln -sf ${logfile} ${shortlog}
fi
NL=`echo -ne '\015'`
# This fun command does the following:
# - the passed server command is backgrounded
# - the pid of the background process is saved in the usual place
# - the server process is brought back to the foreground
# - if the server process exits prematurely the fg command errors
# and a message is written to stdout and the service failure file
# The pid saved can be used in screen_stop() as a process group
# id to kill off all child processes
echo "Running: $cmd & echo \$! >$pid; fg || echo \"$service failed to start\" | tee \"$failure\"$NL"
screen -S $screen_name -p $service -X stuff "$cmd & echo \$! >$pid; fg || echo \"$service failed to start\" | tee \"$failure\"$NL"
}
function _is_running_in_screen {
local service=$1
local screen_name=${SCREEN_NAME:-stack}
local status_dir=${SERVICE_DIR:-${DEST}/status}
local service_dir="$status_dir/$screen_name"
local pid="$service_dir/$service.pid"
local failure="$service_dir/$service.failure"
if [[ ! -e "$pid" && ! -e "$failure" ]]; then
# if we don't have a pid or a failure for why, the command may not
# have stuffed in there
echo "Warning: neither $pid nor $failure exist, $service didn't seem to start"
return 1
fi
if [[ -n ${SCREEN_LOGDIR} ]]; then
# if we should be logging, but we don't have a log file, something is wrong
local logfile=${SCREEN_LOGDIR}/screen-${service}.${CURRENT_LOG_TIME}.log
if [[ ! -e "$logfile" ]]; then
echo "Warning: expected logfile $logfile not found, something wrong with starting $service"
return 1
fi
fi
return 0
}
# Helper to launch a service in a named screen # Helper to launch a service in a named screen
# screen_it service "command-line" # screen_it service "command-line"
function screen_it { function screen_it {
local service=$1 SCREEN_NAME=${SCREEN_NAME:-stack}
local cmd=$2 SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}
local screen_name=${SCREEN_NAME:-stack} USE_SCREEN=$(trueorfalse True $USE_SCREEN)
local status_dir=${SERVICE_DIR:-${DEST}/status}
local service_dir="$status_dir/$screen_name"
local use_screen=$(trueorfalse True $USE_SCREEN)
local pid="$service_dir/$service.pid"
if is_service_enabled $1; then if is_service_enabled $1; then
# Append the service to the screen rc file # Append the service to the screen rc file
screen_rc "$service" "$cmd" screen_rc "$1" "$2"
if [[ "$use_screen" = "True" ]]; then if [[ "$USE_SCREEN" = "True" ]]; then
screen -S $screen_name -X screen -t $service screen -S $SCREEN_NAME -X screen -t $1
# this retry loop brought to you by slow compute nodes, screen raciness, if [[ -n ${SCREEN_LOGDIR} ]]; then
# and frustration in upgrading. screen -S $SCREEN_NAME -p $1 -X logfile ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log
local screen_tries=0 screen -S $SCREEN_NAME -p $1 -X log on
while [ "$screen_tries" -lt 10 ]; do ln -sf ${SCREEN_LOGDIR}/screen-${1}.${CURRENT_LOG_TIME}.log ${SCREEN_LOGDIR}/screen-${1}.log
_start_in_screen "$service" "$cmd" fi
if _is_running_in_screen $service; then
screen_tries=10 # sleep to allow bash to be ready to be send the command - we are
else # creating a new window in screen and then sends characters, so if
screen_tries=$[screen_tries + 1] # bash isn't running by the time we send the command, nothing happens
echo "Failed to start service after $screen_tries attempt(s), retrying" sleep 3
if [[ "$screen_tries" -eq 10 ]]; then
echo "Too many retries, giving up" NL=`echo -ne '\015'`
exit 1 # This fun command does the following:
fi # - the passed server command is backgrounded
sleep 1 # - the pid of the background process is saved in the usual place
fi # - the server process is brought back to the foreground
done # - if the server process exits prematurely the fg command errors
# and a message is written to stdout and the service failure file
# The pid saved can be used in screen_stop() as a process group
# id to kill off all child processes
screen -S $SCREEN_NAME -p $1 -X stuff "$2 & echo \$! >$SERVICE_DIR/$SCREEN_NAME/$1.pid; fg || echo \"$1 failed to start\" | tee \"$SERVICE_DIR/$SCREEN_NAME/$1.failure\"$NL"
else else
# Spawn directly without screen # Spawn directly without screen
run_process "$service" "$cmd" >$pid run_process "$1" "$2" >$SERVICE_DIR/$SCREEN_NAME/$1.pid
fi fi
fi fi
} }