From a591009e67b741ff8d37a4ed4221da6d20b05c44 Mon Sep 17 00:00:00 2001 From: Stephen Darlington Date: Tue, 6 Nov 2018 15:56:29 +0000 Subject: [PATCH 1/5] Allow commands to prefix server start --- bin/benchmark-servers-start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/benchmark-servers-start.sh b/bin/benchmark-servers-start.sh index f1e6e5c..70a0354 100755 --- a/bin/benchmark-servers-start.sh +++ b/bin/benchmark-servers-start.sh @@ -163,7 +163,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 \ + PROPS_ENV0=${PROPS_ENV} nohup $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 & @@ -175,7 +175,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 $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 @@ -196,7 +196,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 $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")"> Server restarter is started for ${host_to_restart} \ From b32a31e05225e904dfe24f02373473691a35d81d Mon Sep 17 00:00:00 2001 From: Stephen Darlington Date: Tue, 6 Nov 2018 18:05:49 +0000 Subject: [PATCH 2/5] 'eval' SERVER_START_PREFIX --- bin/benchmark-servers-start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/benchmark-servers-start.sh b/bin/benchmark-servers-start.sh index 70a0354..53d8e67 100755 --- a/bin/benchmark-servers-start.sh +++ b/bin/benchmark-servers-start.sh @@ -163,7 +163,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 $SERVER_START_PREFIX ${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 & @@ -175,7 +175,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 $SERVER_START_PREFIX ${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 @@ -196,7 +196,7 @@ do if [[ "${delay}" != "" ]] && [[ "${pause}" != "" ]] && [[ "${period}" != "" ]] ; then file_log=${RESTARTERS_LOGS_DIR}"/"${now}"_id"${id}"_"${host_name}".log" - nohup $SERVER_START_PREFIX ${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")"> Server restarter is started for ${host_to_restart} \ From 50bcd5cc5f58322fa2e31c15d26622b5a5399635 Mon Sep 17 00:00:00 2001 From: Stephen Darlington Date: Tue, 6 Nov 2018 18:06:40 +0000 Subject: [PATCH 3/5] Shorthand for configuring multiple nodes per server --- bin/benchmark-servers-start.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bin/benchmark-servers-start.sh b/bin/benchmark-servers-start.sh index 53d8e67..26d9a8d 100755 --- a/bin/benchmark-servers-start.sh +++ b/bin/benchmark-servers-start.sh @@ -156,6 +156,14 @@ 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 if [[ ${host_name} = "127.0.0.1" || ${host_name} = "localhost" ]]; then mkdir -p ${LOGS_DIR} @@ -208,6 +216,8 @@ do fi done fi + done + # End of restarter logic. id=$((1 + $id)) From babbe6a877cf0a87fa12642a6931cbd503fd75d3 Mon Sep 17 00:00:00 2001 From: Stephen Darlington Date: Thu, 8 Nov 2018 15:09:50 +0000 Subject: [PATCH 4/5] Stop servers when started with the *n shortcut --- bin/benchmark-servers-stop.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/benchmark-servers-stop.sh b/bin/benchmark-servers-stop.sh index 8f65ebe..d2fe88c 100755 --- a/bin/benchmark-servers-stop.sh +++ b/bin/benchmark-servers-stop.sh @@ -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" From 824f50832d1cfd0c1ce8d9c7698e73422159f897 Mon Sep 17 00:00:00 2001 From: Stephen Darlington Date: Mon, 4 Feb 2019 15:10:08 +0000 Subject: [PATCH 5/5] Keep logs for all nodes --- bin/benchmark-servers-start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/benchmark-servers-start.sh b/bin/benchmark-servers-start.sh index 26d9a8d..a664edb 100755 --- a/bin/benchmark-servers-start.sh +++ b/bin/benchmark-servers-start.sh @@ -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} @@ -164,6 +162,8 @@ do 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}