Merge lp:~pbeaman/akiban-persistit/fix-accumulator-restart-test into lp:akiban-persistit

[Peter Beaman]

Fix silly error in the stress test AccumulatorRestart. There is code that attempts to determine whether to trigger a new cycle based on temporal proximity to an actual or anticipated checkpoint. The trigger code uses a randomly generated integer timeOffset which falls between -500 and +500. In the special case where the randomly generated number is zero, the triggering condition never fires and the main cycle run in an infinite loop. Observed on persistit-stress-multi-config-2.

[Nathan Williams (nwilliams)]

As described.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job server-packages failed at build number 2825: http://172.16.20.104:8080/job/server-packages/2825/

* view must-pass failed: server-packages is red

review: Needs Fixing

[Nathan Williams (nwilliams)]

Unrelated failure.

=== modified file 'src/test/java/com/persistit/stress/unit/AccumulatorRestart.java'
--- src/test/java/com/persistit/stress/unit/AccumulatorRestart.java	2012-11-23 19:40:49 +0000
+++ src/test/java/com/persistit/stress/unit/AccumulatorRestart.java	2012-11-27 14:48:19 +0000
@@ -170,7 +170,7 @@
             }
         }
         if (_checkpointTime != 0) {
-            if (timeOffset > 0 && now > _checkpointTime + timeOffset) {
+            if (timeOffset >= 0 && now > _checkpointTime + timeOffset) {
                 _checkpointTime = 0;
                 return true;
             } else if (timeOffset < 0 && now > _checkpointTime + timeOffset + CHECKPOINT_INTERVAL * Util.MS_PER_S) {