1 files changed, 94 insertions, 3 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
index 65239bbe02..50b1ea7cea 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
@@ -20,15 +20,20 @@
  */
 package org.apache.qpid.test.utils;
 
+import java.io.IOException;
+
 import org.apache.log4j.Logger;
 
 public class SpawnedBrokerHolder implements BrokerHolder
 {
     private static final Logger LOGGER = Logger.getLogger(SpawnedBrokerHolder.class);
 
+    private final boolean _isWindows = String.valueOf(System.getProperty("os.name")).toLowerCase().contains("windows");
     private final Process _process;
+    private final Integer _pid;
+    private final String _workingDirectory;
 
-    public SpawnedBrokerHolder(final Process process)
+    public SpawnedBrokerHolder(final Process process, final String workingDirectory)
     {
         if(process == null)
         {
@@ -36,14 +41,87 @@ public class SpawnedBrokerHolder implements BrokerHolder
         }
 
         _process = process;
+        _pid = retrieveUnixPidIfPossible();
+        _workingDirectory = workingDirectory;
+    }
+
+    @Override
+    public String getWorkingDirectory()
+    {
+        return _workingDirectory;
     }
 
     public void shutdown()
     {
         LOGGER.info("Destroying broker process");
-
         _process.destroy();
 
+        reapChildProcess();
+    }
+
+    @Override
+    public void kill()
+    {
+        if (_pid == null)
+        {
+            LOGGER.info("Destroying broker process");
+            _process.destroy();
+        }
+        else
+        {
+            LOGGER.info("Killing broker process with PID " + _pid);
+            sendSigkillForImmediateShutdown(_pid);
+        }
+
+        reapChildProcess();
+    }
+
+    private void sendSigkillForImmediateShutdown(Integer pid)
+    {
+        boolean killSuccessful = false;
+        try
+        {
+            final Process killProcess = Runtime.getRuntime().exec("kill -KILL " + pid);
+            killProcess.waitFor();
+            killSuccessful = killProcess.exitValue() == 0;
+        }
+        catch (IOException e)
+        {
+            LOGGER.error("Error whilst killing process " + _pid, e);
+        }
+        catch (InterruptedException e)
+        {
+            Thread.currentThread().interrupt();
+        }
+        finally
+        {
+            if (!killSuccessful)
+            {
+                _process.destroy();
+            }
+        }
+    }
+
+    private Integer retrieveUnixPidIfPossible()
+    {
+        if(!_isWindows)
+        {
+            try
+            {
+                Integer pid = ReflectionUtils.getDeclaredField(_process, "pid");
+                LOGGER.info("PID " + pid);
+                return pid;
+            }
+            catch (ReflectionUtilsException e)
+            {
+                LOGGER.warn("Could not get pid for process, Broker process shutdown will be ungraceful");
+            }
+        }
+        return null;
+    }
+
+    private void reapChildProcess()
+    {
         try
         {
             _process.waitFor();
@@ -51,8 +129,21 @@ public class SpawnedBrokerHolder implements BrokerHolder
         }
         catch (InterruptedException e)
         {
-            LOGGER.error("Interrupted whilst waiting for process destruction");
+            LOGGER.error("Interrupted whilst waiting for process shutdown");
             Thread.currentThread().interrupt();
         }
+        finally
+        {
+            try
+            {
+                _process.getInputStream().close();
+                _process.getErrorStream().close();
+                _process.getOutputStream().close();
+            }
+            catch (IOException e)
+            {
+            }
+        }
     }
+
 }