From 7a9f74de8007f7a00860b1f0e4abeb5c4c672ccb Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 8 Jul 2015 00:04:27 -0400
Subject: [PATCH 1/2] print PID when starting ES in integ tests too.

---
 .../main/resources/ant/integration-tests.xml  | 30 +++++++++++++++++--
 1 file changed, 28 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 5e50481c594..a15aa406be3 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -37,8 +37,25 @@
     </sequential>
   </macrodef>
 
+  <!-- extracts PID from file -->
+  <macrodef name="extract-pid">
+      <attribute name="property"/>
+    <sequential>
+      <loadfile srcFile="${integ.pidfile}" property="@{property}">
+        <filterchain>
+          <striplinebreaks/>
+        </filterchain>
+      </loadfile>
+    </sequential>
+  </macrodef>
+
   <!-- unzip core release artifact and start ES -->
   <target name="start-external-cluster" depends="stop-external-cluster" unless="${shouldskip}">
+    <local name="integ.finalname"/>
+    <local name="integ.home"/>
+    <local name="integ.repo.home"/>
+    <local name="integ.pid"/>
+
     <delete dir="${integ.scratch}"/>
     <property name="integ.finalname" value="${project.artifactId}-${project.version}"/>
 
@@ -56,11 +73,17 @@
       <http url="http://127.0.0.1:9200"/>
     </waitfor>
 
-    <echo>External cluster started</echo>
+    <extract-pid property="integ.pid"/>
+    <echo>External cluster started PID ${integ.pid}</echo>
   </target>
 
   <!-- unzip core release artifact, install plugin, then start ES -->
   <target name="start-external-cluster-with-plugin" depends="stop-external-cluster" unless="${shouldskip}">
+    <local name="integ.home"/>
+    <local name="integ.repo.home"/>
+    <local name="integ.plugin.url"/>
+    <local name="integ.pid"/>
+
     <delete dir="${integ.scratch}"/>
     <unzip src="${org.elasticsearch:elasticsearch:zip}"
            dest="${integ.scratch}"/>
@@ -81,12 +104,15 @@
       <http url="http://127.0.0.1:9200"/>
     </waitfor>
 
-    <echo>External cluster started</echo>
+    <extract-pid property="integ.pid"/>
+    <echo>External cluster started PID ${integ.pid}</echo>
   </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">
+    <local name="integ.pid"/>
+
     <!-- read contents of the pid file -->
     <loadfile srcFile="${integ.pidfile}" property="integ.pid">
       <filterchain>

From fcddec532aedbc132a39cef494ebd34205d80e66 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 8 Jul 2015 00:10:25 -0400
Subject: [PATCH 2/2] Use extract-pid when killing, too

---
 dev-tools/src/main/resources/ant/integration-tests.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index a15aa406be3..35e94031bbf 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -113,13 +113,7 @@
   <target name="stop-external-cluster" if="integ.pidfile.exists">
     <local name="integ.pid"/>
 
-    <!-- read contents of the pid file -->
-    <loadfile srcFile="${integ.pidfile}" property="integ.pid">
-      <filterchain>
-        <striplinebreaks/>
-      </filterchain>
-    </loadfile>
-
+    <extract-pid property="integ.pid"/>
     <echo>Shutting down external cluster PID ${integ.pid}</echo>
 
     <exec executable="taskkill" failonerror="true" osfamily="winnt">