From 99c127f9751b0775302eb31fd9a97154fa74de54 Mon Sep 17 00:00:00 2001
From: Adithya Chandra <adithyac@amazon.com>
Date: Fri, 19 Apr 2019 17:12:57 -0700
Subject: [PATCH] Reader startup script improvements

* Use exec to start the java process. All signals sent to the wrapper
are sent to the java process.

* If arguments are specified ignore ES_HOME and JAVA_HOME env variables.
---
 pa_bin/performance-analyzer-agent | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pa_bin/performance-analyzer-agent b/pa_bin/performance-analyzer-agent
index 52c58704..10bf5d6b 100755
--- a/pa_bin/performance-analyzer-agent
+++ b/pa_bin/performance-analyzer-agent
@@ -5,31 +5,33 @@ if [ "$START_PERF_ANALYZER" = "false" ]; then
     exit 0
 fi
 
-if [ -z "$ES_HOME" ]; then
-    ES_HOME=$1
-    if [ -z "$1" ]; then
+if [ -z "$1" ]; then
+    if [ -z "$ES_HOME" ]; then
         echo "ES_HOME needs to be set or passed in as the first parameter."
         exit 1
     fi
+else
+    ES_HOME=$2
 fi
 
-if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME=$2
-    if [ -z "$2" ]; then
+if [ -z "$2" ]; then
+    if [ -z "$JAVA_HOME" ]; then
         echo "JAVA_HOME needs to be set or passed in as the second parameter."
         exit 1
     fi
+else
+    JAVA_HOME=$2
 fi
 
 if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null; then
-    $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
+    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
     -DconfigFilePath=$3 \
     -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
     -XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m \
     -cp $ES_HOME/lib/*:$ES_HOME/plugins/opendistro_performance_analyzer/* com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerApp
 else
     echo 'Starting deamon'
-    $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
+    exec $JAVA_HOME/bin/java -Des.path.home=$ES_HOME -Dlog4j.configurationFile=$ES_HOME/plugins/opendistro_performance_analyzer/pa_config/log4j2.xml \
         -DconfigFilePath=$3 \
         -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
         -XX:InitialBootClassLoaderMetaspaceSize=30720 -XX:MaxRAM=400m \