Author: stefanegli
Date: Tue Feb 9 10:50:37 2016
New Revision: 1729358
URL: http://svn.apache.org/viewvc?rev=1729358&view=rev
Log:
OAK-3986 : increasing margin from 50 to 100 percent and doing only 14
iterations. This is to fine-tune to get it to work under the current travis-ci.
It looks like the memory setting might be a bit too restrictive there. Lets see
if this works. When running this regressionIT without the commitHook fix the
slow down was much more than 100 percent - it was more in the 300-500 percent
range, so even 100 percent should be fine
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java?rev=1729358&r1=1729357&r2=1729358&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java
Tue Feb 9 10:50:37 2016
@@ -128,19 +128,19 @@ public class NonLocalObservationIT exten
// phase 2 is 10 times measuring how long subsequent 10000 iterations
take
// (this used to fail due to 'many commit roots')
boolean ignoreFirstSpike = true;
- for (int i = 0; i < 15; i++) {
+ for (int i = 0; i < 14; i++) {
System.out.println(new Date() + ": test run of 10000
iterations...");
long testMeasurement = doRandomized(r, 10000);
Exception e = exception.get();
if (e != null) {
throw e;
}
- // the testMeasurement should now take less than 50% in relation to
+ // the testMeasurement should now take less than 100% in relation
to
// the
// scaleMeasurement
- long max = (long) (scaleMeasurement * 1.5);
+ long max = (long) (scaleMeasurement * 2);
System.out.println(new Date() + ": test run took " +
testMeasurement + ", scaleMeasurement=" + scaleMeasurement
- + ", plus 50% margin: " + max);
+ + ", plus 100% margin: " + max);
if (testMeasurement >= max && ignoreFirstSpike) {
System.out.println(new Date() + ": this iteration would have
failed, but we're now allowing one spike (ignoreFirstSpike)");
ignoreFirstSpike = false;
