Various stuff lying around

core/src/main/java/org/radargun/Operation.java

@@ -28,6 +28,13 @@ private Operation(int id, String name) {
       this.name = name;
    }
 
+   // This is useful when running report.sh
+   private Object readResolve() {
+      if (!byId.containsKey(id)) byId.put(id, this);
+      if (!byName.containsKey(name)) byName.put(name, this);
+      return this;
+   }
+
    /**
     * Remove all registered operations. WARNING: Should only be used when no clients access Operations class any longer (e.g. testing purposes)
     */

core/src/main/java/org/radargun/RemoteSlaveConnection.java

@@ -410,12 +410,6 @@ private void startServerSocket() throws IOException {
       }
       serverSocketChannel.socket().bind(address);
       log.info("Master started and listening for connection on: " + address);
-      log.info("Waiting 5 seconds for server socket to open completely");
-      try {
-         Thread.sleep(5000);
-      } catch (InterruptedException ex) {
-         // ignore
-      }
    }
 
    private int readInt(SocketChannel socketChannel) throws IOException {

core/src/main/java/org/radargun/ServiceHelper.java

@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.radargun.config.Cluster;
 import org.radargun.config.Definition;
 import org.radargun.config.InitHelper;
 import org.radargun.config.PropertyHelper;
@@ -22,6 +23,7 @@ public final class ServiceHelper {
 
    private static String currentPlugin;
    private static String currentConfigName;
+   private static Cluster currentCluster;
    private static int currentSlaveIndex;
 
    private ServiceHelper() {}
@@ -34,23 +36,29 @@ public static String getConfigName() {
       return currentConfigName;
    }
 
+   public static Cluster getCluster() {
+      return currentCluster;
+   }
+
    public static int getSlaveIndex() {
       return currentSlaveIndex;
    }
 
    /**
     * As we expect only one service at time to be running on one node, this sets current
-    * plugin, configuration name and slave index that can be later retrieved, e.g. in some
+    * plugin, configuration name, cluster info and slave index that can be later retrieved, e.g. in some
     * init method (annotated by {@link org.radargun.config.Init}) that would not be able
     * to retrieve this information in another way.
-    *
+    * 
     * @param plugin
     * @param configName
+    * @param cluster
     * @param slaveIndex
     */
-   public static void setServiceContext(String plugin, String configName, int slaveIndex) {
+   public static void setServiceContext(String plugin, String configName, Cluster cluster, int slaveIndex) {
       currentPlugin = plugin;
       currentConfigName = configName;
+      currentCluster = cluster;
       currentSlaveIndex = slaveIndex;
    }
 
@@ -61,7 +69,7 @@ public static void setServiceContext(String plugin, String configName, int slave
     * Then, sets up all properties declared on the service (and its superclasses).
     * Finally calls any methods of the class annotated by {@link org.radargun.config.Init @Init}.
     *
-    * Don't forget to call {@link #setServiceContext(String, String, int)} before calling this method.
+    * Don't forget to call {@link #setServiceContext(String, String, Cluster, int)} before calling this method.
     */
    public static Object createService(String plugin, String service,
                                       Map<String, Definition> properties, Map<String, String> extras) {

core/src/main/java/org/radargun/SlaveBase.java

@@ -37,7 +37,7 @@ protected void scenarioLoop() throws IOException {
       state.setService(setup.service);
       state.setTimeline(new Timeline(state.getSlaveIndex()));
       Map<String, String> extras = getCurrentExtras(configuration, cluster);
-      ServiceHelper.setServiceContext(setup.plugin, configuration.name, state.getSlaveIndex());
+      ServiceHelper.setServiceContext(setup.plugin, configuration.name, cluster, state.getSlaveIndex());
       Object service = ServiceHelper.createService(setup.plugin, setup.service, setup.getProperties(), extras);
       Map<Class<?>, Object> traits = null;
       try {

core/src/main/java/org/radargun/config/Cluster.java

@@ -163,6 +163,11 @@ public Group(String name, int size) {
          this.size = size;
       }
 
+      @Override
+      public String toString() {
+         return name;
+      }
+
       @Override
       public boolean equals(Object o) {
          if (this == o) return true;

core/src/main/java/org/radargun/stages/CommandStage.java

@@ -10,6 +10,7 @@
 import org.radargun.config.Property;
 import org.radargun.config.Stage;
 import org.radargun.utils.ArgsConverter;
+import org.radargun.utils.Utils;
 
 /**
  * @author Radim Vansa <rvansa@redhat.com>
@@ -58,6 +59,10 @@ public DistStageAck executeOnSlave() {
             process = startProcess();
             if (var != null) {
                slaveState.put(var, process);
+               String pid = Utils.getProcessID(process);
+               if (pid != null) {
+                  System.setProperty("process." + var + ".id", pid);
+               }
             }
          } else if (var != null) {
             process = (Process) slaveState.get(var);

core/src/main/java/org/radargun/stages/test/TestStage.java

@@ -1,6 +1,7 @@
 package org.radargun.stages.test;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -101,7 +102,7 @@ public DistStageAck executeOnSlave() {
       try {
          long startNanos = TimeService.nanoTime();
          log.info("Starting test " + testName);
-         stressorsManager = setUpAndStartStressors();
+         setUpAndStartStressors();
          waitForStressorsToFinish(stressorsManager);
          destroy();
          log.info("Finished test. Test duration is: " + Utils.getNanosDurationString(TimeService.nanoTime() - startNanos));
@@ -160,23 +161,23 @@ protected StageResult processAckOnMaster(List<DistStageAck> acks, String testNam
       }
    }
 
-   protected StressorsManager setUpAndStartStressors() {
+   protected void setUpAndStartStressors() {
       long startTime = TimeService.currentTimeMillis();
       completion = createCompletion();
       CountDownLatch finishCountDown = new CountDownLatch(1);
-      completion.setCompletionHandler(new Runnable() {
-         @Override
-         public void run() {
-            //Stop collecting statistics for duration-based tests
-            if (duration > 0) {
-               finished = true;
-            }
-            finishCountDown.countDown();
+      CountDownLatch startCountDown = new CountDownLatch(getNumThreadsOn(slaveState.getSlaveIndex()));
+      completion.setCompletionHandler(() -> {
+         //Stop collecting statistics for duration-based tests
+         if (duration > 0) {
+            finished = true;
          }
+         finishCountDown.countDown();
       });
       operationSelector = wrapOperationSelector(createOperationSelector());
 
-      List<Stressor> stressors = startStressors();
+      List<Stressor> stressors = createStressors(startCountDown);
+      stressorsManager = new StressorsManager(stressors, startTime, finishCountDown);
+      startStressors(stressors, startCountDown);
       started = true;
 
       if (rampUp > 0) {
@@ -186,7 +187,6 @@ public void run() {
             throw new IllegalStateException("Interrupted during ramp-up.", e);
          }
       }
-      return new StressorsManager(stressors, startTime, finishCountDown);
    }
 
    protected void waitForStressorsToFinish(StressorsManager manager) {
@@ -245,24 +245,26 @@ protected OperationSelector wrapOperationSelector(OperationSelector operationSel
       return operationSelector;
    }
 
-   protected List<Stressor> startStressors() {
+   protected List<Stressor> createStressors(CountDownLatch startCountDown) {
       int myFirstThread = getFirstThreadOn(slaveState.getSlaveIndex());
       int myNumThreads = getNumThreadsOn(slaveState.getSlaveIndex());
-      CountDownLatch threadCountDown = new CountDownLatch(myNumThreads);
 
       List<Stressor> stressors = new ArrayList<>();
       for (int threadIndex = stressors.size(); threadIndex < myNumThreads; threadIndex++) {
-         Stressor stressor = new Stressor(this, getLogic(), myFirstThread + threadIndex, threadIndex, logTransactionExceptions, threadCountDown, delayBetweenRequests);
+         Stressor stressor = new Stressor(this, getLogic(), myFirstThread + threadIndex, threadIndex, logTransactionExceptions, startCountDown, delayBetweenRequests);
          stressors.add(stressor);
-         stressor.start();
       }
+      return stressors;
+   }
+
+   protected void startStressors(Collection<Stressor> stressors, CountDownLatch startCountDown) {
+      stressors.forEach(Stressor::start);
       try {
-         threadCountDown.await();
+         startCountDown.await();
       } catch (InterruptedException e) {
          //FIXME implement me
       }
       log.info("Started " + stressors.size() + " stressor threads.");
-      return stressors;
    }
 
    protected DistStageAck newStatisticsAck(List<Stressor> stressors) {

core/src/main/java/org/radargun/utils/Utils.java

@@ -222,6 +222,25 @@ public static SlaveConnectionInfo getSlaveConnectionInfo(int slaveIndex) throws
       return connection;
    }
 
+   public static String getProcessID(Process process) {
+      Class<?> clazz = process.getClass();
+      try {
+         if (clazz.getName().equals("java.lang.UNIXProcess")) {
+            Field pidField = clazz.getDeclaredField("pid");
+            pidField.setAccessible(true);
+            Object value = pidField.get(process);
+            if (value instanceof Integer) {
+               return String.valueOf(value);
+            }
+         } else {
+            throw new IllegalArgumentException("Only unix is supported as OS.");
+         }
+      } catch (Exception ex) {
+         log.errorf(ex, "Failure retrieving PID");
+      }
+      return null;
+   }
+
    public static class JarFilenameFilter implements FilenameFilter {
       public boolean accept(File dir, String name) {
          String fileName = name.toUpperCase(Locale.ENGLISH);

extensions/cache/src/main/java/org/radargun/stages/cache/test/BasicOperationsTestStage.java

@@ -43,7 +43,7 @@ public class BasicOperationsTestStage extends CacheOperationsTestStage {
    @Property(doc = "Ratio of GET_AND_REMOVE requests. Default is 0.")
    protected int getAndRemoveRatio = 0;
 
-   @InjectTrait
+   @InjectTrait(dependency = InjectTrait.Dependency.MANDATORY)
    protected BasicOperations basicOperations;
 
    @Init

extensions/rest/src/main/java/org/radargun/stages/BackgroundRESTOperationsStartStage.java

@@ -48,7 +48,7 @@ public DistStageAck executeOnSlave() {
       }
       try {
          log.info("Starting test " + testName + " in the background.");
-         stressorsManager = setUpAndStartStressors();
+         setUpAndStartStressors();
          slaveState.put(testName, this);
          return successfulResponse();
       } catch (Exception e) {