From 913fd13d0a0ed885e09fe29f5d8291244d8e82b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B2=D0=B8=D1=80=D0=B8=D0=B4=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=9C=D0=B8=D1=85=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=87?= Date: Mon, 14 Sep 2020 12:28:46 +0300 Subject: [PATCH] kill -9 fix. remove this flag. fix preset JVM options. --- bin/benchmark-bootstrap.sh | 2 +- bin/benchmark-servers-stop.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/benchmark-bootstrap.sh b/bin/benchmark-bootstrap.sh index 8f0af19..663753d 100755 --- a/bin/benchmark-bootstrap.sh +++ b/bin/benchmark-bootstrap.sh @@ -83,7 +83,7 @@ CP=${CP}":${SCRIPT_DIR}/../libs/*" # # ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE # -JVM_OPTS="-Xms2g -Xmx2g -server -Djava.net.preferIPv4Stack=true "${JVM_OPTS} +JVM_OPTS="-Djava.net.preferIPv4Stack=true "${JVM_OPTS} # # Assertions are disabled by default. diff --git a/bin/benchmark-servers-stop.sh b/bin/benchmark-servers-stop.sh index 8f65ebe..a5549d8 100755 --- a/bin/benchmark-servers-stop.sh +++ b/bin/benchmark-servers-stop.sh @@ -71,7 +71,7 @@ if [ "${REMOTE_USER}" == "" ]; then exit 1 fi -pkill -9 -f "benchmark-server-restarter-start.sh" +pkill -f "benchmark-server-restarter-start.sh" if [[ "${RESTART_SERVERS}" != "true" ]] && [[ "${RESTART_SERVERS}" != "false" ]]; then echo "<"$(date +"%H:%M:%S")"> All server restartets are stopped." @@ -82,10 +82,10 @@ for host_name in "${hosts0[@]}"; do if [[ ${host_name} = "127.0.0.1" || ${host_name} = "localhost" ]] then - pkill -9 -f "Dyardstick.server" + pkill -f "Dyardstick.server" else - `ssh -o PasswordAuthentication=no ${REMOTE_USER}"@"${host_name} pkill -9 -f "Dyardstick.server"` + `ssh -o PasswordAuthentication=no ${REMOTE_USER}"@"${host_name} pkill -f "Dyardstick.server"` fi echo "<"$(date +"%H:%M:%S")"> Server is stopped on "${host_name}