Merge lp:~pbeaman/akiban-persistit/fix-1044513-assert-in-IntegrityCheckTest2 into lp:akiban-persistit
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Nathan Williams | ||||
Approved revision: | 361 | ||||
Merged at revision: | 361 | ||||
Proposed branch: | lp:~pbeaman/akiban-persistit/fix-1044513-assert-in-IntegrityCheckTest2 | ||||
Merge into: | lp:akiban-persistit | ||||
Diff against target: |
26 lines (+2/-2) 2 files modified
src/main/java/com/persistit/Persistit.java (+1/-1) src/test/java/com/persistit/IntegrityCheckTest.java (+1/-1) |
||||
To merge this branch: | bzr merge lp:~pbeaman/akiban-persistit/fix-1044513-assert-in-IntegrityCheckTest2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Akiban Build User | Needs Fixing | ||
Nathan Williams | Approve | ||
Review via email: mp+122358@code.launchpad.net |
Description of the change
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#
Note: the proposal replaces the original one and should be merged first so that the harden-CLI branch can build.
Short and sweet.