Merge branch 2.3 into 3.0

neo4j · May 31, 2016 · d1e6bc0 · d1e6bc0
2 parents 0955c37 + 02c1ef0
commit d1e6bc0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/...ava/org/neo4j/kernel/stresstests/transaction/checkpoint/TransactionThroughputChecker.java b/...ava/org/neo4j/kernel/stresstests/transaction/checkpoint/TransactionThroughputChecker.java
@@ -22,6 +22,7 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.neo4j.kernel.stresstests.transaction.checkpoint.workload.Workload;
 
@@ -32,9 +33,10 @@ public class TransactionThroughputChecker implements Workload.TransactionThrough
     private final List<Double> reports = new ArrayList<>();
 
     @Override
-    public void report( long transactions, long elapsedTime)
+    public void report( long transactions, long timeSlotMillis )
     {
-        reports.add( ((double) transactions / (double) elapsedTime) );
+        long elapsedSeconds = TimeUnit.MILLISECONDS.toSeconds( timeSlotMillis );
+        reports.add( ((double) transactions / (double) elapsedSeconds) );
     }
 
     public void assertThroughput( PrintStream out )
@@ -45,7 +47,7 @@ public void assertThroughput( PrintStream out )
             return;
         }
 
-        out.println( "Throughput reports (tx/ms):" );
+        out.println( "Throughput reports (tx/s):" );
         double sum = 0;
         for ( double report : reports )
         {
@@ -55,7 +57,7 @@ public void assertThroughput( PrintStream out )
         out.println();
 
         double average = sum / (double) reports.size();
-        out.println( "Average throughput (tx/ms): " + average );
+        out.println( "Average throughput (tx/s): " + average );
 
         double powerSum = 0.0;
         for ( double report : reports )
@@ -64,9 +66,9 @@ public void assertThroughput( PrintStream out )
         }
 
         double stdDeviation = Math.sqrt( powerSum / (double) reports.size() );
-        out.println( "Standard deviation (tx/ms): " + stdDeviation );
+        out.println( "Standard deviation (tx/s): " + stdDeviation );
         double twoStdDeviations = stdDeviation * 2.0;
-        out.println( "Two standard deviations (tx/ms): " + twoStdDeviations );
+        out.println( "Two standard deviations (tx/s): " + twoStdDeviations );
 
         int inOneStdDeviationRange = 0;
         int inTwoStdDeviationRange = 0;
@@ -79,12 +81,12 @@ public void assertThroughput( PrintStream out )
             }
             else if ( Math.abs( average - report ) <= twoStdDeviations )
             {
-                System.err.println( "Outside _one_ std deviation range: " + report );
+                out.println( "Outside _one_ std deviation range: " + report );
                 inTwoStdDeviationRange++;
             }
             else
             {
-                System.err.println( "Outside _two_ std deviation range: " + report );
+                out.println( "Outside _two_ std deviation range: " + report );
             }
         }
 

diff --git a/...ts/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Worker.java b/...ts/src/test/java/org/neo4j/kernel/stresstests/transaction/checkpoint/workload/Worker.java
@@ -58,7 +58,6 @@ public void run()
                     randomMutation.perform();
                 }
                 tx.success();
-                monitor.transactionCompleted();
             }
             catch ( DeadlockDetectedException ignore )
             {
@@ -69,6 +68,8 @@ public void run()
                 // ignore and go on
                 e.printStackTrace();
             }
+
+            monitor.transactionCompleted();
         }
         while ( !monitor.stop() );