Merge lp:~pbeaman/akiban-persistit/fix-1044513-assert-in-IntegrityCheckTest2 into lp:akiban-persistit

[Peter Beaman]

Small changes to fix a race in IntegrityCheckTest. Sometime the CLEANUP_MANAGER thread was able to prune all the pages that the test needed to prune in the foreground.

One significant change is that the call in Persistit#initialize(Configuration) to pruneObsoleteTransactions now respects the setting of the JournalManager's _rollbackPruning flag. This is benign because only tests ever disable this flag. If the application intended to disable rollback pruning, it could do so either before or after the initialize method has been called to control the startup behavior. Today a first pass of rollback pruning is always done, so the change potentially gives an application more control.

Note: the proposal replaces the original one and should be merged first so that the harden-CLI branch can build.

[Nathan Williams (nwilliams)]

Short and sweet.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job persistit-build failed at build number 419: http://172.16.20.104:8080/job/persistit-build/419/

* view must-pass failed: persistit-build is yellow

review: Needs Fixing

[Nathan Williams (nwilliams)]

Unrelated bug1019001 again.

=== modified file 'src/main/java/com/persistit/Persistit.java'
--- src/main/java/com/persistit/Persistit.java	2012-08-28 14:29:50 +0000
+++ src/main/java/com/persistit/Persistit.java	2012-08-31 20:23:41 +0000
@@ -595,7 +595,7 @@
                 startTransactionIndexPollTask();
                 flush();
                 _checkpointManager.checkpoint();
-                _journalManager.pruneObsoleteTransactions(true);
+                _journalManager.pruneObsoleteTransactions();
 
                 startCleanupManager();
                 _initialized.set(true);
 
=== modified file 'src/test/java/com/persistit/IntegrityCheckTest.java'
--- src/test/java/com/persistit/IntegrityCheckTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/IntegrityCheckTest.java	2012-08-31 20:23:41 +0000
@@ -179,8 +179,8 @@
         _persistit = new Persistit();
         _persistit.getRecoveryManager().setRecoveryDisabledForTestMode(true);
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
-        disableBackgroundCleanup();
         _persistit.initialize(properties);
+        disableBackgroundCleanup();
 
         for (int i = 0; i < 10; i++) {
             final Exchange ex = _persistit.getExchange(_volumeName, "mvv" + i, true).append(Key.BEFORE);