From f031c17681338d894920e643f8e6e1bc4fdf4789 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 18 Aug 2015 15:40:41 +0200
Subject: [PATCH 1/2] check with jps that the pid file contains a pid that
 actually is an elasticsearch process

relates to #12063
---
 .../main/resources/ant/integration-tests.xml  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index 3da39286400..37fa2e15ce1 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -227,6 +227,27 @@
 
       <extract-pid file="@{es.pidfile}" property="integ.pid"/>
       <echo>Shutting down external node PID ${integ.pid}</echo>
+      <!-- verify with jps that this actually is the correct pid.
+      See if we can find the line "pid org.elasticsearch.bootstrap.Elasticsearch" in the output of jps -l.-->
+      <exec executable="jps">
+        <arg value="-l"/>
+        <redirector outputproperty="jps.pid.line">
+          <outputfilterchain>
+            <linecontains>
+              <contains value="${integ.pid} org.elasticsearch.bootstrap.Elasticsearch"/>
+            </linecontains>
+          </outputfilterchain>
+        </redirector>
+      </exec>
+      <fail
+          message="pid file at @{es.pidfile} is ${integ.pid} but jps -l did not report any process with org.elasticsearch.bootstrap.Elasticsearch and this pid.
+          Did you run mvn clean? Maybe an old pid file is still lying around.">
+        <condition>
+          <not>
+            <isset property="jps.pid.line"/>
+          </not>
+        </condition>
+      </fail>
 
       <exec executable="taskkill" failonerror="true" osfamily="winnt">
         <arg value="/F"/>
@@ -279,8 +300,6 @@
     <startup-elasticsearch/>
   </target>
 
-  <!-- TODO, for some more safety, add back some of the old jps logic
-       and verify the pid is really an ES process! (fail otherwise) -->
   <target name="stop-external-cluster" if="integ.pidfile.exists">
     <stop-node/>
   </target>

From 04141b61c4ea7e622d884cefad40494d8fdd5964 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 18 Aug 2015 18:58:09 +0200
Subject: [PATCH 2/2] make property local and use java home to find jps

---
 .../src/main/resources/ant/integration-tests.xml    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index 37fa2e15ce1..3cc6133b7b4 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -229,9 +229,14 @@
       <echo>Shutting down external node PID ${integ.pid}</echo>
       <!-- verify with jps that this actually is the correct pid.
       See if we can find the line "pid org.elasticsearch.bootstrap.Elasticsearch" in the output of jps -l.-->
-      <exec executable="jps">
+      <local name="jps.pidline"/>
+      <local name="jps.executable"/>
+      <local name="environment"/>
+      <property environment="environment"/>
+      <property name="jps.executable" location="${environment.JAVA_HOME}/bin/jps"/>
+      <exec executable="${jps.executable}" failonerror="true">
         <arg value="-l"/>
-        <redirector outputproperty="jps.pid.line">
+        <redirector outputproperty="jps.pidline">
           <outputfilterchain>
             <linecontains>
               <contains value="${integ.pid} org.elasticsearch.bootstrap.Elasticsearch"/>
@@ -243,9 +248,7 @@
           message="pid file at @{es.pidfile} is ${integ.pid} but jps -l did not report any process with org.elasticsearch.bootstrap.Elasticsearch and this pid.
           Did you run mvn clean? Maybe an old pid file is still lying around.">
         <condition>
-          <not>
-            <isset property="jps.pid.line"/>
-          </not>
+          <equals arg1="${jps.pidline}" arg2=""/>
         </condition>
       </fail>