Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IGNITE-10155 Yardstick should allow modifier when starting servers #29

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

IGNITE-10155 Yardstick should allow modifier when starting servers #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a591009
Allow commands to prefix server start
sdarlington Nov 6, 2018
b32a31e
'eval' SERVER_START_PREFIX
sdarlington Nov 6, 2018
50bcd5c
Shorthand for configuring multiple nodes per server
sdarlington Nov 6, 2018
babbe6a
Stop servers when started with the *n shortcut
sdarlington Nov 8, 2018
824f508
Keep logs for all nodes
sdarlington Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions bin/benchmark-servers-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ do
fi
done

file_log=${LOGS_DIR}"/"${now}"-id"${id}"-"${host_name}"-"${DS}".log"

if [[ ${JVM_OPTS_ORIG} == *"#filename#"* ]]
then
filename_ptrn=${LOGS_DIR}/${now}-server-id${id}-${host_name}-${DS}
Expand All @@ -156,14 +154,24 @@ do
GC_JVM_OPTS=" -Xloggc:${LOGS_DIR}/gc-${now}-server-id${id}-${host_name}-${DS}.log"
fi

if [[ ${host_name} =~ (.*)\*([0-9]*)$ ]]; then
host_name=${BASH_REMATCH[1]}
node_count=${BASH_REMATCH[2]}
else
node_count=1
fi

for SERVER_NODE in $( seq 0 $(( $node_count - 1 )) ); do
file_log=${LOGS_DIR}"/"${now}"-id"${id}"-"${host_name}"-"${DS}"-"${SERVER_NODE}".log"

if [[ ${host_name} = "127.0.0.1" || ${host_name} = "localhost" ]]; then
mkdir -p ${LOGS_DIR}

SAVED_JVM_OPTS=${JVM_OPTS}

JAVA_HOME=${JAVA_HOME} MAIN_CLASS='org.yardstickframework.BenchmarkServerStartUp' \
JVM_OPTS="${JVM_OPTS} ${GC_JVM_OPTS} ${SERVER_JVM_OPTS} -Dyardstick.server${id} " CP=${CP} CUR_DIR=${CUR_DIR} \
PROPS_ENV0=${PROPS_ENV} nohup ${SCRIPT_DIR}/benchmark-bootstrap.sh \
PROPS_ENV0=${PROPS_ENV} nohup $( eval echo ${SERVER_START_PREFIX} ) ${SCRIPT_DIR}/benchmark-bootstrap.sh \
${CONFIG_PRM} "--config" ${CONFIG_INCLUDE} "--logsFolder" ${LOGS_DIR} \
"--remoteuser" ${REMOTE_USER} "--remoteHostName" ${host_name} > ${file_log} 2>& 1 &

Expand All @@ -175,7 +183,7 @@ do
"JAVA_HOME='${JAVA_HOME}'" \
"MAIN_CLASS='org.yardstickframework.BenchmarkServerStartUp'" "JVM_OPTS='${JVM_OPTS} ${GC_JVM_OPTS} ${SERVER_JVM_OPTS} -Dyardstick.server${id} '" \
"CP='${CP}'" "CUR_DIR='${CUR_DIR}'" "PROPS_ENV0='${PROPS_ENV}'" \
"nohup ${SCRIPT_DIR}/benchmark-bootstrap.sh ${CONFIG_PRM} "--config" ${CONFIG_INCLUDE} "--logsFolder" ${LOGS_DIR} \
"nohup $( eval echo ${SERVER_START_PREFIX} ) ${SCRIPT_DIR}/benchmark-bootstrap.sh ${CONFIG_PRM} "--config" ${CONFIG_INCLUDE} "--logsFolder" ${LOGS_DIR} \
"--remoteuser" ${REMOTE_USER} "--remoteHostName" ${host_name} > ${file_log} 2>& 1 &"
fi

Expand All @@ -196,7 +204,7 @@ do
if [[ "${delay}" != "" ]] && [[ "${pause}" != "" ]] && [[ "${period}" != "" ]] ; then
file_log=${RESTARTERS_LOGS_DIR}"/"${now}"_id"${id}"_"${host_name}".log"

nohup ${SCRIPT_DIR}/benchmark-server-restarter-start.sh "${host_name}" "${id}" "${CONFIG_PRM}" \
nohup $( eval echo ${SERVER_START_PREFIX} ) ${SCRIPT_DIR}/benchmark-server-restarter-start.sh "${host_name}" "${id}" "${CONFIG_PRM}" \
"${delay}" "${pause}" "${period}" "${CONFIG_INCLUDE}" > ${file_log} 2>& 1 &

echo "<"$(date +"%H:%M:%S")"><yardstick> Server restarter is started for ${host_to_restart} \
Expand All @@ -208,6 +216,8 @@ do
fi
done
fi
done

# End of restarter logic.

id=$((1 + $id))
Expand Down
1 change: 1 addition & 0 deletions bin/benchmark-servers-stop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ fi
IFS=',' read -ra hosts0 <<< "${SERVER_HOSTS}"
for host_name in "${hosts0[@]}";
do
host_name=$(echo $host_name | sed 's/\*[0-9]*$//')
if [[ ${host_name} = "127.0.0.1" || ${host_name} = "localhost" ]]
then
pkill -9 -f "Dyardstick.server"
Expand Down