Merge pull request #49 from mongodb-labs/no-endless-loop

SLS-1922 Prevent endless loop upon shutdown

Author: SimonEismann

ycsb-mongodb/core/src/main/java/site/ycsb/TerminatorThread.java

@@ -51,10 +51,16 @@ public void run() {
     System.err.println("Maximum time elapsed. Requesting stop for the workload.");
     workload.requestStop();
     System.err.println("Stop requested for workload. Now Joining!");
+    long startTime = System.currentTimeMillis();
     for (Thread t : threads) {
       while (t.isAlive()) {
         try {
           t.join(waitTimeOutInMS);
+
+          long elapsedTime = System.currentTimeMillis() - startTime;
+          if (elapsedTime > 3 * maxExecutionTime * 1000) {
+            System.exit(1);
+          }
           if (t.isAlive()) {
             System.out.println("Still waiting for thread " + t.getName() + " to complete. " +
                 "Workload status: " + workload.isStopRequested());