Add -c option for libertyperf and twasperf if javacore directory is non-standard

Signed-off-by: Kevin Grigorenko <kevin.grigorenko@us.ibm.com>

Author: kgibm

containerdiag.bat

@@ -21,7 +21,7 @@
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-set "VERSION=0.1.20220628"
+set "VERSION=0.1.20221108"
 set "SCRIPTNAME=%~nx0"
 
 goto :start

containerdiag.sh

@@ -35,7 +35,7 @@ EOF
   exit 22
 }
 
-VERSION="0.1.20220628"
+VERSION="0.1.20221108"
 NAMESPACE=""
 VERBOSE=0
 APPEND=1

scripts/javathreaddumps.sh

@@ -19,6 +19,7 @@
 usage() {
   printf "Usage: %s [OPTIONS] [PODNAME]...\n" "$(basename "${0}")"
   cat <<"EOF"
+             -c: Path to javacores (default /output/javacore*)
              -d: DELAY (for run.sh)
              -n: No download necessary (for run.sh)
              -v: verbose output to stderr
@@ -31,10 +32,14 @@ DELAY=""
 NODOWNLOAD=""
 SKIPSTATS=""
 VERBOSE=""
+JAVACORE_PATH="/output/javacore*"
 
 OPTIND=1
-while getopts "d:nvz?" opt; do
+while getopts "c:d:nvz?" opt; do
   case "$opt" in
+    c)
+      JAVACORE_PATH="${OPTARG}"
+      ;;
     d)
       DELAY="-d ${OPTARG}"
       ;;
@@ -69,4 +74,4 @@ for ARG in "${@}"; do
   PODARGS="${PODARGS} -p ${ARG}"
 done
 
-run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "kill -3 $(podinfo.sh ${VERBOSE} -j -p ${@}); podfscp.sh ${VERBOSE} -s ${PODARGS} /output/javacore* ; podfsrm.sh ${VERBOSE} ${PODARGS} /output/javacore*"
+run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "kill -3 $(podinfo.sh ${VERBOSE} -j -p ${@}); sleep 2; podfscp.sh ${VERBOSE} -s ${PODARGS} ${JAVACORE_PATH} ; podfsrm.sh ${VERBOSE} ${PODARGS} ${JAVACORE_PATH}"

scripts/libertyperf.sh

@@ -19,6 +19,7 @@
 usage() {
   printf "Usage: %s [OPTIONS] [PODNAME]...\n" "$(basename "${0}")"
   cat <<"EOF"
+             -c: Path to javacores (default /output/javacore*)
              -d: DELAY (for run.sh)
              -j: JAVACORE_INTERVAL for linperf.sh
              -m: VMSTAT_INTERVAL for linperf.sh
@@ -43,10 +44,14 @@ SCRIPT_SPAN=""
 TOP_INTERVAL=""
 TOP_DASH_H_INTERVAL=""
 VMSTAT_INTERVAL=""
+JAVACORE_PATH="/output/javacore*"
 
 OPTIND=1
-while getopts "d:hj:m:nps:t:u:vz?" opt; do
+while getopts "c:d:hj:m:nps:t:u:vz?" opt; do
   case "$opt" in
+    c)
+      JAVACORE_PATH="${OPTARG}"
+      ;;
     d)
       DELAY="-d ${OPTARG}"
       ;;
@@ -100,7 +105,7 @@ for ARG in "${@}"; do
 done
 
 if [ "${SKIPSERVERDUMP}" -eq "0" ]; then
-  run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && DUMPS=\"\$(libertydump.sh ${VERBOSE} ${PODARGS})\"; podfscp.sh ${VERBOSE} -s ${PODARGS} /logs /config /output/javacore* \${DUMPS} ; podfsrm.sh ${VERBOSE} ${PODARGS} /output/javacore* \${DUMPS}"
+  run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && DUMPS=\"\$(libertydump.sh ${VERBOSE} ${PODARGS})\"; podfscp.sh ${VERBOSE} -s ${PODARGS} /logs /config ${JAVACORE_PATH} \${DUMPS} ; podfsrm.sh ${VERBOSE} ${PODARGS} ${JAVACORE_PATH} \${DUMPS}"
 else
-  run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && podfscp.sh ${VERBOSE} -s ${PODARGS} /logs /config /output/javacore* ; podfsrm.sh ${VERBOSE} ${PODARGS} /output/javacore*"
+  run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && podfscp.sh ${VERBOSE} -s ${PODARGS} /logs /config ${JAVACORE_PATH} ; podfsrm.sh ${VERBOSE} ${PODARGS} ${JAVACORE_PATH}"
 fi

scripts/twasperf.sh

@@ -19,6 +19,7 @@
 usage() {
   printf "Usage: %s [OPTIONS] [PODNAME]...\n" "$(basename "${0}")"
   cat <<"EOF"
+             -c: Path to javacores (default /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/javacore*)
              -d: DELAY (for run.sh)
              -j: JAVACORE_INTERVAL for linperf.sh
              -m: VMSTAT_INTERVAL for linperf.sh
@@ -41,10 +42,14 @@ SCRIPT_SPAN=""
 TOP_INTERVAL=""
 TOP_DASH_H_INTERVAL=""
 VMSTAT_INTERVAL=""
+JAVACORE_PATH="/opt/IBM/WebSphere/AppServer/profiles/AppSrv01/javacore*"
 
 OPTIND=1
-while getopts "d:hj:m:ns:t:u:vz?" opt; do
+while getopts "c:d:hj:m:ns:t:u:vz?" opt; do
   case "$opt" in
+    c)
+      JAVACORE_PATH="${OPTARG}"
+      ;;
     d)
       DELAY="-d ${OPTARG}"
       ;;
@@ -94,4 +99,4 @@ for ARG in "${@}"; do
   PODARGS="${PODARGS} -p ${ARG}"
 done
 
-run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && podfscp.sh ${VERBOSE} -s ${PODARGS} /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/ /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/config/ /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/javacore* ; podfsrm.sh ${VERBOSE} ${PODARGS} /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/javacore*"
+run.sh ${DELAY} ${NODOWNLOAD} ${VERBOSE} ${SKIPSTATS} sh -c "linperf.sh -q ${SCRIPT_SPAN} ${JAVACORE_INTERVAL} ${TOP_INTERVAL} ${TOP_DASH_H_INTERVAL} ${VMSTAT_INTERVAL} $(podinfo.sh ${VERBOSE} -j -p ${@}) && podfscp.sh ${VERBOSE} -s ${PODARGS} /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/logs/ /opt/IBM/WebSphere/AppServer/profiles/AppSrv01/config/ ${JAVACORE_PATH} ; podfsrm.sh ${VERBOSE} ${PODARGS} ${JAVACORE_PATH}"