Merge lp:~pbeaman/akiban-persistit/better_4hour_tpcc_2 into lp:akiban-persistit

[Peter Beaman]

This branch solves several problems relating to Journal I/O, pruning and performance.

Specifically, when running the 4-hour TPCC test on a particular server, perf02, the "terminal" threads outrun the ability of the JOURNAL_COPIER thread to remove obsolete journal files. The result is an ever-growing collection of journal files that eventually overflow the disk. The distinguishing feature of perf02 is that it has 12 fast cores (x2 with hyper-threading) but just a single disk drive.

This branch keeps the number of journal files under control during the test (never exceeding 16) and allows the test to complete. The test arrives at a stable configuration after a couple of hours and there's no reason to believe it would fail if run for much longer periods of time. However, a longer test run has not yet been completed.

Major changes:

1) The Transaction#commit() method now includes a call to new method JournalManager#throttle() which imposes a voluntary delay if the JournalCopier#urgency() value becomes large. The delay adjusts upward when urgency becomes extreme.

2) The order in which commit() completes its actions has changed to:

   flush()
   notifyComplete();
   throttle();
   waitForDurability();

Further, durability is measured from a timestamp taken immediately after the call to flush().

It is safe to call notifyComplete() and allow other concurrent transactions to continue (thereby hopefully allowing more transactions to join a GROUP commit). It is safe because no other transaction released by notifyComplete() can commit and become durable unless this one is also durable.

3) Pruning is accelerated, preventing old aborted transactions from holding up the JOURNAL_COPIER cleanup process. There are two main changes to support faster pruning:

3a) Scheduling: the CLEANUP_MANAGER normally polls once per second, but when the queue becomes more than half full it now runs continuously until the queue is no longer half full.

3b) Prune on write: when a dirty page thats needs pruning is being written to disk, a new optional code path prunes it before writing it. This reduces the likelihood that a page that is read back in from disk will need to be pruned.

Other changes made while analyzing test runs include updates in the IOMeter log function, and small fixes in the CLI.

One source a many lines of diff output is that to enable a new test the PersistitUnitTestCase class was moved from com.persistit.unit to com.persistit. In a future proposal I intend to move all of the unit tests to the correct package (same package as the class they are testing) and get rid of TestShim.

Due to the large size of this proposal, it not be approved until after Akiban Server 1.4.0 - and for that reason perhaps deserves a new version number, which is not in the current proposal.

This branch depends on the eclipse-canonical-format branch to reduce the number of format-only diffs.

[lp:~pbeaman/akiban-persistit/better_4hour_tpcc_2]

370. By Peter Beaman on 2012-08-24

Merge from release-notes-3.16

371. By Peter Beaman on 2012-08-28

Merge from trunk, modify according to review comments.

372. By Peter Beaman on 2012-08-28

One more review comment.

373. By Peter Beaman on 2012-08-28

Remove extraneous eclipse-format file

Unmerged revisions

=== modified file 'doc/Configuration.rst'
--- doc/Configuration.rst	2012-06-11 21:25:37 +0000
+++ doc/Configuration.rst	2012-08-24 14:04:53 +0000
@@ -221,7 +221,7 @@
   ``serialOverride``, ``constructorOverride``: (``com.persistit.Configuration#setSerialOverride`` ``com.persistit.Configuration#setConstructorOverride``) 
       Control aspects of object serialization. See :ref:`Serialization`.
 
-  ``showgui``: (``com.persistit.Configuration#setShowGUI``), True of False.  
+  ``showgui``: (``com.persistit.Configuration#setShowGUI``), True or False (default).  
       If true, Persistit attempts to create and display an instance of the AdminUI utility panel within the current JVM. 
       Alternatively, AdminUI uses RMI and can be launched and run remotely if ``rmiport`` or ``rmihost`` has been 
       specified.
@@ -231,6 +231,18 @@
       install a logging adapter to reroute messages through Log4J, SLF4J or other logger. The ``logfile`` property is used 
       only when no adapter has been installed.
 
+  ``bufferinventory``: (``com.persistit.Configuration#setBufferInventoryEnabled``), True or False (default).
+      If true, Persistit periodically records an inventory of all the buffes in the buffers pools to the System Volume. The inventory
+      enables Persistit to preload the buffer pools then next time it starts up with approximately the same pages that were present
+      before shutdown. To enable buffer preloading, the bufferpreload property must also be true.
+      
+  ``bufferpreload``: (``com.persistit.Configuration#setBufferPreloadEnabled``), True or False (default).
+      If true, and if a buffer pool inventory was previously recorded, Persistit attempts to "warm up" the buffer pool
+      by preloading pages that were present in the buffer pool when Persistit last shut down. This may allow a freshly started
+      Persistit instance to begin service a workload similar to what it had previously been processing without incurring the
+      cost of many random disk reads to load pages.
+        
+
 For all integer-valued properties, the suffix “K” may be used to represent kilo, “M” for mega, “G” for giga and “T” for tera. For example, “2M” represents the value 2,097,152.
 
 A Configuration Example

=== added file 'eclipse-format.xml'
--- eclipse-format.xml	1970-01-01 00:00:00 +0000
+++ eclipse-format.xml	2012-08-24 14:04:53 +0000
@@ -0,0 +1,72 @@
+<!--
+
+    Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
+    
+    This program and the accompanying materials are made available
+    under the terms of the Eclipse Public License v1.0 which
+    accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+    
+    This program may also be available under different license terms.
+    For more information, see www.akiban.com or contact [e-mail].
+    
+    Contributors:
+    Akiban Technologies, Inc.
+
+-->
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="2">
+<profile kind="CleanUpProfile" name="Akiban-Persistit" version="2">
+<setting id="cleanup.format_source_code" value="true"/>
+<setting id="cleanup.add_missing_annotations" value="true"/>
+<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
+<setting id="cleanup.remove_unused_private_types" value="true"/>
+<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.add_generated_serial_version_id" value="false"/>
+<setting id="cleanup.make_variable_declarations_final" value="true"/>
+<setting id="cleanup.add_missing_methods" value="false"/>
+<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+<setting id="cleanup.correct_indentation" value="true"/>
+<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
+<setting id="cleanup.add_serial_version_id" value="false"/>
+<setting id="cleanup.remove_unused_private_methods" value="true"/>
+<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+<setting id="cleanup.remove_unused_private_members" value="false"/>
+<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
+<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+<setting id="cleanup.format_source_code_changes_only" value="false"/>
+<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.add_missing_nls_tags" value="false"/>
+<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
+<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="false"/>
+<setting id="cleanup.remove_unnecessary_casts" value="true"/>
+<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
+<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.remove_unused_private_fields" value="true"/>
+<setting id="cleanup.make_parameters_final" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+<setting id="cleanup.remove_unused_imports" value="true"/>
+<setting id="cleanup.organize_imports" value="true"/>
+<setting id="cleanup.sort_members" value="false"/>
+<setting id="cleanup.remove_private_constructors" value="true"/>
+<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
+<setting id="cleanup.always_use_blocks" value="true"/>
+<setting id="cleanup.never_use_blocks" value="false"/>
+<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.remove_unused_local_variables" value="false"/>
+<setting id="cleanup.make_private_fields_final" value="true"/>
+<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
+<setting id="cleanup.add_default_serial_version_id" value="true"/>
+<setting id="cleanup.sort_members_all" value="false"/>
+<setting id="cleanup.use_blocks" value="false"/>
+<setting id="cleanup.add_missing_override_annotations" value="true"/>
+<setting id="cleanup.make_local_variable_final" value="true"/>
+</profile>
+</profiles>

=== modified file 'src/main/java/com/persistit/Buffer.java'
--- src/main/java/com/persistit/Buffer.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/Buffer.java	2012-08-24 14:04:53 +0000
@@ -264,6 +264,9 @@
 
     private final static int BINARY_SEARCH_THRESHOLD = 6;
 
+    private final static int PRUNE_MVV_HELPER_CHANGED = 1;
+    private final static int PRUNE_MVV_HELPER_HAS_LONG = 2;
+
     abstract static class VerifyVisitor {
 
         protected void visitPage(final long timestamp, final Volume volume, final long page, final int type,
@@ -502,15 +505,23 @@
         Debug.$assert0.t(isMine());
         final long checkpointTimestamp = _persistit.getTimestampAllocator().getProposedCheckpointTimestamp();
         if (isDirty() && !isTemporary() && getTimestamp() < checkpointTimestamp && timestamp > checkpointTimestamp) {
-            writePage();
+            writePage(false);
             _pool.bumpForcedCheckpointWrites();
         }
     }
 
     void writePage() throws PersistitException {
+        writePage(_persistit.getJournalManager().isWritePagePruningEnabled());
+    }
+
+    private void writePage(final boolean prune) throws PersistitException {
+        assert isMine();
         _persistit.checkFatal();
         final Volume volume = getVolume();
         if (volume != null) {
+            if (prune) {
+                pruneMvvValues(null, false);
+            }
             clearSlack();
             save();
             _vol.getStorage().writePage(this);
@@ -1501,9 +1512,13 @@
                 Debug.$assert0.t(p + KEYBLOCK_LENGTH < _keyBlockEnd ? pointer > 0 : true);
                 putInt(newTail + TAILBLOCK_POINTER, pointer);
             } else {
-                final int storedLength = valueHelper.storeVersion(_bytes, newTail + _tailHeaderSize + klength, -1,
-                        _bytes.length); // TODO limit
-                incCountIfMvv(_bytes, newTail + _tailHeaderSize + klength, storedLength & MVV.STORE_LENGTH_MASK);
+                final int offset = newTail + _tailHeaderSize + klength;
+                final int storedLength = valueHelper.storeVersion(_bytes, offset, -1, _bytes.length); // TODO
+                // limit
+                incCountIfMvv(_bytes, offset, storedLength & MVV.STORE_LENGTH_MASK);
+
+                // TODO - remove after debugging
+                MVV.verify(_persistit.getTransactionIndex(), _bytes, offset, storedLength & MVV.STORE_LENGTH_MASK);
             }
             //
             // Correct not to call getFastIndex()
@@ -1629,9 +1644,14 @@
             Debug.$assert0.t(p + KEYBLOCK_LENGTH < _keyBlockEnd ? pointer > 0 : pointer == -1);
             putInt(newTail + TAILBLOCK_POINTER, (int) pointer);
         } else {
-            final int storedLength = valueHelper.storeVersion(_bytes, newTail + _tailHeaderSize + klength, oldTailSize
-                    - _tailHeaderSize - klength, _bytes.length); // TODO - limit
-            isMVV = isValueMVV(_bytes, newTail + _tailHeaderSize + klength, storedLength & MVV.STORE_LENGTH_MASK);
+            final int offset = newTail + _tailHeaderSize + klength;
+            final int storedLength = valueHelper.storeVersion(_bytes, offset, oldTailSize - _tailHeaderSize - klength,
+                    _bytes.length); // TODO - limit
+            isMVV = isValueMVV(_bytes, offset, storedLength & MVV.STORE_LENGTH_MASK);
+
+            // TODO - remove after debugging
+            MVV.verify(_persistit.getTransactionIndex(), _bytes, offset, storedLength & MVV.STORE_LENGTH_MASK);
+
         }
         if (!wasMVV && isMVV) {
             _mvvCount++;
@@ -3466,7 +3486,12 @@
                     if (visitor != null) {
                         visitor.visitDataRecord(key, p, tail, klength, offset, length, getBytes());
                     }
-                    Debug.$assert1.t(MVV.verify(_bytes, offset, length));
+
+                    if (!MVV.verify(_bytes, offset, length)) {
+                        throw new InvalidPageStructureException("invalid MVV record at offset/length=" + offset + "/"
+                                + length);
+                    }
+
                 }
 
                 if (_pool != null && getKeyCount() > _pool.getMaxKeys()) {
@@ -3546,63 +3571,15 @@
                 final long timestamp = _persistit.getTimestampAllocator().updateTimestamp();
                 _mvvCount = 0;
                 writePageOnCheckpoint(timestamp);
-                final List<PrunedVersion> prunedVersions = new ArrayList<PrunedVersion>();
-                for (int p = KEY_BLOCK_START; p < _keyBlockEnd; p += KEYBLOCK_LENGTH) {
-                    final int kbData = getInt(p);
-                    final int tail = decodeKeyBlockTail(kbData);
-                    final int tbData = getInt(tail);
-                    final int klength = decodeTailBlockKLength(tbData);
-                    final int oldTailSize = decodeTailBlockSize(tbData);
-                    final int offset = tail + _tailHeaderSize + klength;
-                    final int oldSize = oldTailSize - klength - _tailHeaderSize;
-
-                    if (oldSize > 0) {
-                        int valueByte = _bytes[offset] & 0xFF;
-                        if (isLongMVV(_bytes, offset, oldSize)) {
-                            /*
-                             * Can't prune in this pass because of long record
-                             * timestamp management. Simply remember that there
-                             * are long records to prune, then prune them in a
-                             * copy of the buffer.
-                             */
-                            hasLongMvvRecords = true;
-                        }
-                        if (valueByte == MVV.TYPE_MVV) {
-                            final int newSize = MVV.prune(_bytes, offset, oldSize, _persistit.getTransactionIndex(),
-                                    true, prunedVersions);
-                            if (newSize != oldSize) {
-                                changed = true;
-                                final int newTailSize = klength + newSize + _tailHeaderSize;
-                                final int oldNext = (tail + oldTailSize + ~TAILBLOCK_MASK) & TAILBLOCK_MASK;
-                                final int newNext = (tail + newTailSize + ~TAILBLOCK_MASK) & TAILBLOCK_MASK;
-                                if (newNext < oldNext) {
-                                    // Free the remainder of the old tail block
-                                    deallocTail(newNext, oldNext - newNext);
-                                } else {
-                                    Debug.$assert0.t(newNext == oldNext);
-                                }
-                                // Rewrite the tail block header
-                                putInt(tail, encodeTailBlock(newTailSize, klength));
-                                if (Debug.ENABLED) {
-                                    MVV.verify(_bytes, offset, newSize);
-                                }
-                            }
-                            valueByte = newSize > 0 ? _bytes[offset] & 0xFF : -1;
-                            incCountIfMvv(_bytes, offset, newSize);
-                        }
-
-                        if (pruneAntiValue(valueByte, p, tree)) {
-                            changed = true;
-                            p -= KEYBLOCK_LENGTH;
-                        }
-                    }
-                }
+                final int flags = pruneMvvValuesHelper(tree);
+                changed = (flags & PRUNE_MVV_HELPER_CHANGED) != 0;
+                hasLongMvvRecords = (flags & PRUNE_MVV_HELPER_HAS_LONG) != 0;
+
                 if (changed) {
                     setDirtyAtTimestamp(timestamp);
                 }
 
-                deallocatePrunedVersions(_persistit, _vol, prunedVersions);
-                prunedVersions.clear();
+                final List<PrunedVersion> prunedVersions = new ArrayList<PrunedVersion>();
 
                 if (pruneLongMVVs && hasLongMvvRecords) {
                     final List<PersistitException> deferredExceptions = new ArrayList<PersistitException>();
@@ -3645,6 +3622,63 @@
         return changed;
     }
 
+    private int pruneMvvValuesHelper(final Tree tree) throws PersistitException {
+        boolean changed = false;
+        boolean hasLongMvvRecords = false;
+        final List<PrunedVersion> prunedVersions = new ArrayList<PrunedVersion>();
+
+        for (int p = KEY_BLOCK_START; p < _keyBlockEnd; p += KEYBLOCK_LENGTH) {
+            final int kbData = getInt(p);
+            final int tail = decodeKeyBlockTail(kbData);
+            final int tbData = getInt(tail);
+            final int klength = decodeTailBlockKLength(tbData);
+            final int oldTailSize = decodeTailBlockSize(tbData);
+            final int offset = tail + _tailHeaderSize + klength;
+            final int oldSize = oldTailSize - klength - _tailHeaderSize;
+
+            if (oldSize > 0) {
+                int valueByte = _bytes[offset] & 0xFF;
+                if (isLongMVV(_bytes, offset, oldSize)) {
+                    /*
+                     * Can't prune in this pass because of long record timestamp
+                     * management. Simply remember that there are long records
+                     * to prune, then prune them in a copy of the buffer.
+                     */
+                    hasLongMvvRecords = true;
+                }
+                if (valueByte == MVV.TYPE_MVV) {
+                    final int newSize = MVV.prune(_bytes, offset, oldSize, _persistit.getTransactionIndex(), true,
+                            prunedVersions);
+                    if (newSize != oldSize) {
+                        changed = true;
+                        final int newTailSize = klength + newSize + _tailHeaderSize;
+                        final int oldNext = (tail + oldTailSize + ~TAILBLOCK_MASK) & TAILBLOCK_MASK;
+                        final int newNext = (tail + newTailSize + ~TAILBLOCK_MASK) & TAILBLOCK_MASK;
+                        if (newNext < oldNext) {
+                            // Free the remainder of the old tail block
+                            deallocTail(newNext, oldNext - newNext);
+                        } else {
+                            Debug.$assert0.t(newNext == oldNext);
+                        }
+                        // Rewrite the tail block header
+                        putInt(tail, encodeTailBlock(newTailSize, klength));
+                        Debug.$assert0.t(MVV.verify(_bytes, offset, newSize));
+                    }
+                    valueByte = newSize > 0 ? _bytes[offset] & 0xFF : -1;
+                    incCountIfMvv(_bytes, offset, newSize);
+                }
+
+                if (pruneAntiValue(valueByte, p, tree)) {
+                    changed = true;
+                    p -= KEYBLOCK_LENGTH;
+                }
+            }
+        }
+        deallocatePrunedVersions(_persistit, _vol, prunedVersions);
+        prunedVersions.clear();
+        return (changed ? PRUNE_MVV_HELPER_CHANGED : 0) | (hasLongMvvRecords ? PRUNE_MVV_HELPER_HAS_LONG : 0);
+    }
+
     /**
      * This method attempts to prune each LongRecord MVVs found in the page.
      * This method is performed on a _copy_ of the original Buffer being pruned;
@@ -3745,7 +3779,7 @@
         final byte[] rawBytes = value.getEncodedBytes();
         final int oldLongSize = value.getEncodedSize();
         // TODO - perhaps remove. Done as a precaution for now.
-        MVV.verify(rawBytes, 0, oldLongSize);
+        Debug.$assert0.t(MVV.verify(rawBytes, 0, oldLongSize));
         final List<PrunedVersion> provisionalPrunedVersions = new ArrayList<PrunedVersion>();
         final int newLongSize = MVV.prune(rawBytes, 0, oldLongSize, _persistit.getTransactionIndex(), true,
                 provisionalPrunedVersions);

=== modified file 'src/main/java/com/persistit/BufferPool.java'
--- src/main/java/com/persistit/BufferPool.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/BufferPool.java	2012-08-24 14:04:53 +0000
@@ -15,16 +15,14 @@
 
 package com.persistit;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -32,6 +30,7 @@
 import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.persistit.JournalManager.PageNode;
 import com.persistit.exception.InUseException;
 import com.persistit.exception.InvalidPageAddressException;
 import com.persistit.exception.InvalidPageStructureException;
@@ -92,6 +91,17 @@
      */
     private final static int WRITE_AGE_THRESHOLD_RATIO = 4;
 
+    private final static String INVENTORY_TREE_NAME = "_buffers";
+    /**
+     * Maximum number of buffer inventory versions to retain
+     */
+    private final static int INVENTORY_VERSIONS = 3;
+
+    /**
+     * Preload log multiple
+     */
+    private final static int INVENTORY_PRELOAD_LOG_MESSAGE_MULTIPLE = 10000;
+
     /**
      * The Persistit instance that references this BufferPool.
      */
@@ -203,23 +213,11 @@
     private volatile int _pageWriterTrancheSize = PAGE_WRITER_TRANCHE_SIZE;
 
     /**
-     * Polling interval for PageCacher
-     */
-    private volatile long _cacherPollInterval;
-
-    /**
      * The PAGE_WRITER IOTaskRunnable
      */
     private PageWriter _writer;
 
     /**
-     * The PAGE_CACHER IOTaskRunnable
-     */
-    private PageCacher _cacher;
-
-    private String _defaultLogPath;
-
-    /**
      * Construct a BufferPool with the specified count of <code>Buffer</code>s
      * of the specified size.
      * 
@@ -289,37 +287,6 @@
             throw e;
         }
         _writer = new PageWriter();
-        _cacher = new PageCacher();
-    }
-
-    void warmupBufferPool(final String pathName, final String fname) throws PersistitException {
-        final File file = new File(pathName, fname + ".log");
-        _defaultLogPath = file.getAbsolutePath();
-
-        try {
-            if (!file.exists()) {
-                file.createNewFile();
-            }
-
-            final BufferedReader reader = new BufferedReader(new FileReader(file));
-            String currLine;
-            while ((currLine = reader.readLine()) != null) {
-                final String[] info = currLine.split(" ");
-                if (info.length == 2) {
-                    final Volume vol = _persistit.getVolume(info[1]);
-                    if (vol != null) {
-                        final long page = Long.parseLong(info[0]);
-                        final Buffer buff = get(vol, page, false, true);
-                        buff.release();
-                    }
-                }
-            }
-            reader.close();
-            _cacherPollInterval = _persistit.getConfiguration().getBufferInventoryPollingInterval();
-            _cacher.start();
-        } catch (final IOException e) {
-            throw new PersistitException(e);
-        }
     }
 
     void startThreads() throws PersistitException {
@@ -329,9 +296,7 @@
     void close() {
         _closed.set(true);
         _persistit.waitForIOTaskStop(_writer);
-        _persistit.waitForIOTaskStop(_cacher);
         _writer = null;
-        _cacher = null;
     }
 
     /**
@@ -340,7 +305,6 @@
      */
     void crash() {
         IOTaskRunnable.crash(_writer);
-        IOTaskRunnable.crash(_cacher);
     }
 
     void flush(final long timestamp) throws PersistitInterruptedException {
@@ -433,35 +397,6 @@
         }
     }
 
-    private void populateWarmupFile() throws PersistitException {
-        final File file = new File(_defaultLogPath);
-
-        try {
-            final BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-            for (int i = 0; i < _buffers.length; ++i) {
-                final Buffer b = _buffers[i];
-                if (b != null && b.isValid() && !b.isDirty()) {
-                    final long page = b.getPageAddress();
-                    final Volume volume = b.getVolume();
-                    final long page2 = b.getPageAddress();
-                    final Volume volume2 = b.getVolume();
-
-                    // Check if buffer has changed while reading
-                    if (page == page2 && volume == volume2 && volume != null) {
-                        final String addr = Long.toString(page);
-                        final String vol = volume.getName();
-                        writer.append(addr + " " + vol);
-                        writer.newLine();
-                        writer.flush();
-                    }
-                }
-            }
-            writer.close();
-        } catch (final IOException e) {
-            throw new PersistitException(e);
-        }
-    }
-
     private boolean selected(final Buffer buffer, final int includeMask, final int excludeMask) {
         return ((includeMask == 0) || (buffer.getStatus() & includeMask) != 0)
                 && (buffer.getStatus() & excludeMask) == 0;
@@ -1403,35 +1338,6 @@
         }
     }
 
-    /**
-     * Implementation of PAGE_CACHER thread
-     */
-    class PageCacher extends IOTaskRunnable {
-
-        PageCacher() {
-            super(BufferPool.this._persistit);
-        }
-
-        void start() {
-            start("PAGE_CACHER:" + _bufferSize, _cacherPollInterval);
-        }
-
-        @Override
-        public void runTask() throws Exception {
-            populateWarmupFile();
-        }
-
-        @Override
-        protected boolean shouldStop() {
-            return _closed.get() && !isFlushing();
-        }
-
-        @Override
-        protected long pollInterval() {
-            return isFlushing() ? 0 : _cacherPollInterval;
-        }
-    }
-
     @Override
     public String toString() {
         return "BufferPool[" + _bufferCount + "@" + _bufferSize + (_closed.get() ? ":closed" : "") + "]";
@@ -1486,4 +1392,133 @@
         }
         stream.flush();
     }
+
+    void recordBufferInventory(final long timestamp) throws PersistitException {
+        final Exchange exchange = getBufferInventoryExchange();
+        /*
+         * Advisory only - transaction integrity not needed
+         */
+        exchange.ignoreTransactions();
+        try {
+            int total = 0;
+            exchange.clear().append(_bufferSize).append(timestamp).append(Key.BEFORE);
+            final Value value = exchange.getValue();
+            final int clockValueBefore = _clock.get();
+            for (int index = 0; index < _buffers.length; index++) {
+                final Buffer buffer = _buffers[index];
+                long page1 = -1, page2 = -1;
+                Volume volume1 = null, volume2 = null;
+                if (buffer != null && buffer.isValid()) {
+                    while (true) {
+                        page1 = buffer.getPageAddress();
+                        volume1 = buffer.getVolume();
+                        page2 = buffer.getPageAddress();
+                        volume2 = buffer.getVolume();
+                        if (page1 == page2 && volume1 == volume2) {
+                            break;
+                        }
+                        Util.spinSleep();
+                    }
+                    if (volume1 != null && !volume1.isTemporary()) {
+                        value.clear().setStreamMode(true);
+                        value.put(volume1.getHandle());
+                        value.put(page1);
+                        exchange.to(index).store();
+                        total++;
+                    }
+                }
+            }
+            final int clockValueAfter = _clock.get();
+            exchange.cut();
+            value.clear().setStreamMode(true);
+            value.put(_bufferCount);
+            value.put(total);
+            value.put(clockValueBefore);
+            value.put(clockValueAfter);
+            value.put(System.currentTimeMillis());
+            exchange.store();
+            int count = 0;
+            while (exchange.previous()) {
+                if (++count > INVENTORY_VERSIONS) {
+                    exchange.remove(Key.GTEQ);
+                }
+            }
+        } catch (final PersistitException e) {
+            _persistit.getLogBase().bufferInventoryException.log(e);
+        }
+    }
+
+    void preloadBufferInventory() {
+        int count = 0;
+        int total = 0;
+        try {
+            final JournalManager jman = _persistit.getJournalManager();
+            final Exchange exchange = getBufferInventoryExchange();
+            final Value value = exchange.getValue();
+            final List<PageNode> pageNodes = new ArrayList<PageNode>();
+            boolean foundInventory = false;
+            exchange.clear().append(_bufferSize).append(Key.AFTER);
+            while (exchange.previous()) {
+                if (exchange.getValue().isDefined()) {
+                    foundInventory = true;
+                    break;
+                }
+            }
+            if (!foundInventory) {
+                return;
+            }
+            value.setStreamMode(true);
+            /* int bufferCount = */value.getInt();
+            total = value.getInt();
+            /* int clockValueBefore = */value.getInt();
+            /* int clockValueAfter = */value.getInt();
+            final long systemTime = value.getLong();
+
+            _persistit.getLogBase().bufferInventoryLoad.log(systemTime);
+
+            exchange.append(Key.BEFORE);
+
+            while (exchange.next()) {
+                value.setStreamMode(true);
+                final int volumeHandle = value.getInt();
+                final long pageAddress = value.getLong();
+                final PageNode pn = new PageNode(volumeHandle, pageAddress);
+                pageNodes.add(pn);
+            }
+
+            Collections.sort(pageNodes, PageNode.READ_COMPARATOR);
+            for (final PageNode pn : pageNodes) {
+                final Volume vol = jman.volumeForHandle(pn.getVolumeHandle());
+                if (vol == null) {
+                    continue;
+                }
+                try {
+                    final Buffer buff = get(vol, pn.getPageAddress(), false, true);
+                    buff.release();
+                    count++;
+                    if ((count % INVENTORY_PRELOAD_LOG_MESSAGE_MULTIPLE) == 0) {
+                        _persistit.getLogBase().bufferInventoryProgress.log(count, total);
+                    }
+                    if (count >= _bufferCount) {
+                        //
+                        // If the buffer pool is now smaller, no need to load
+                        // more pages
+                        //
+                        break;
+                    }
+                } catch (final PersistitException e) {
+                    // ignore it
+                }
+            }
+        } catch (final PersistitException e) {
+            _persistit.getLogBase().bufferInventoryException.log(e);
+        } finally {
+            _persistit.getLogBase().bufferInventoryProgress.log(count, total);
+        }
+    }
+
+    private Exchange getBufferInventoryExchange() throws PersistitException {
+        final Volume sysvol = _persistit.getSystemVolume();
+        return _persistit.getExchange(sysvol, INVENTORY_TREE_NAME, true);
+    }
 }

=== modified file 'src/main/java/com/persistit/CLI.java'
--- src/main/java/com/persistit/CLI.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/CLI.java	2012-08-24 14:04:53 +0000
@@ -747,7 +747,7 @@
             }
         }
         if (sysvol != null) {
-            properties.put(Persistit.SYSTEM_VOLUME_PROPERTY, sysvol.getName());
+            persistit.getConfiguration().setSysVolume(sysvol.getName());
         }
 
         _persistit = persistit;

=== modified file 'src/main/java/com/persistit/CheckpointManager.java'
--- src/main/java/com/persistit/CheckpointManager.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/CheckpointManager.java	2012-08-24 14:04:53 +0000
@@ -201,6 +201,7 @@
     void pollCreateCheckpoint() throws PersistitException {
         final long now = System.nanoTime();
         if (_lastCheckpointNanos + _checkpointIntervalNanos < now) {
+            _persistit.recordBufferPoolInventory();
             createCheckpoint();
         }
     }
@@ -252,12 +253,12 @@
                 _currentCheckpoint = new Checkpoint(txn.getStartTimestamp(), System.currentTimeMillis());
                 _outstandingCheckpoints.add(_currentCheckpoint);
                 _persistit.getLogBase().checkpointProposed.log(_currentCheckpoint);
-                return _currentCheckpoint;
             } catch (final InterruptedException ie) {
                 throw new PersistitInterruptedException(ie);
             } finally {
                 txn.end();
             }
+            return _currentCheckpoint;
         } finally {
             _persistit.setSessionId(saveSessionId);
         }

=== modified file 'src/main/java/com/persistit/CleanupManager.java'
--- src/main/java/com/persistit/CleanupManager.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/CleanupManager.java	2012-08-24 14:04:53 +0000
@@ -87,6 +87,7 @@
             _accepted.incrementAndGet();
         } else {
             _refused.incrementAndGet();
+            kick();
         }
         return accepted;
     }
@@ -127,6 +128,15 @@
     }
 
     @Override
+    public long getPollInterval() {
+        if (_cleanupActionQueue.size() < DEFAULT_QUEUE_SIZE / 2) {
+            return super.getPollInterval();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
     public void poll() throws Exception {
         _persistit.getIOMeter().poll();
         _persistit.cleanup();

=== modified file 'src/main/java/com/persistit/Configuration.java'
--- src/main/java/com/persistit/Configuration.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/Configuration.java	2012-08-24 14:04:53 +0000
@@ -263,7 +263,7 @@
     /**
      * Property name for the "append only" property.
      */
-    public final static String APPEND_ONLY_PROPERTY = "appendonly";
+    public final static String APPEND_ONLY_PROPERTY_NAME = "appendonly";
 
     /**
      * Property name for the "ignore missing volumes" property.
@@ -276,12 +276,15 @@
     public final static String SPLIT_POLICY_PROPERTY_NAME = "splitpolicy";
 
     /**
-     * Property name to specify the"buffer inventory" property name.
+     * Property name to specify whether buffer preloading is enabled.
+     */
+    public final static String BUFFER_PRELOAD_PROPERTY_NAME = "bufferpreload";
+
+    /**
+     * Property name to specify whether buffer inventory is enabled.
      */
     public final static String BUFFER_INVENTORY_PROPERTY_NAME = "bufferinventory";
 
-    public final static String BUFFER_POLLING_INTERVAL_PROPERTY = "bufferpollinginterval";
-
     /**
      * Property name to specify the default {@link JoinPolicy}.
      */
@@ -634,9 +637,8 @@
     private int rmiServerPort;
     private boolean jmx = true;
     private boolean appendOnly;
-    private String bufferInventoryPathName;
-    private long bufferInventoryPollInterval = 3000000; // default five minute
-                                                        // polling
+    private boolean bufferInventoryEnabled;
+    private boolean bufferPreloadEnabled;
     private boolean ignoreMissingVolumes;
     private String tmpVolDir;
     private int tmpVolPageSize;
@@ -715,9 +717,7 @@
     }
 
     void loadProperties() throws InvalidVolumeSpecificationException {
-        setBufferInventoryPathName(getProperty(BUFFER_INVENTORY_PROPERTY_NAME));
-        setBufferInventoryPollingInterval(getLongProperty(BUFFER_POLLING_INTERVAL_PROPERTY, bufferInventoryPollInterval));
-        setAppendOnly(getBooleanProperty(APPEND_ONLY_PROPERTY, false));
+        setAppendOnly(getBooleanProperty(APPEND_ONLY_PROPERTY_NAME, false));
         setCommitPolicy(getProperty(COMMIT_POLICY_PROPERTY_NAME));
         setConstructorOverride(getBooleanProperty(CONSTRUCTOR_OVERRIDE_PROPERTY_NAME, false));
         setIgnoreMissingVolumes(getBooleanProperty(IGNORE_MISSING_VOLUMES_PROPERTY, false));
@@ -737,6 +737,8 @@
         setShowGUI(getBooleanProperty(SHOW_GUI_PROPERTY_NAME, false));
         setSplitPolicy(getProperty(SPLIT_POLICY_PROPERTY_NAME));
         setSysVolume(getProperty(SYSTEM_VOLUME_PROPERTY_NAME, DEFAULT_SYSTEM_VOLUME_NAME));
+        setBufferInventoryEnabled(getBooleanProperty(BUFFER_INVENTORY_PROPERTY_NAME, false));
+        setBufferPreloadEnabled(getBooleanProperty(BUFFER_PRELOAD_PROPERTY_NAME, false));
 
         loadPropertiesBufferSpecifications();
         loadPropertiesVolumeSpecifications();
@@ -1548,8 +1550,7 @@
     /**
      * <p>
      * Set a pattern that identifies classes to be serialized using standard
-     * Java serialization rather than Persistit's default serialization. TODO
-     * Link to Serialization section of user_guide.html.
+     * Java serialization rather than Persistit's default serialization.
      * </p>
      * <p>
      * Default value is <code>null</code><br />
@@ -1559,6 +1560,8 @@
      * @param serialOverride
      *            the serial override pattern to set
      * @see DefaultCoderManager
+     * @see <a
+     *      href="http://www.akiban.com/ak-docs/admin/persistit/Serialization.html">Serialization</a>
      */
     public void setSerialOverride(final String serialOverride) {
         this.serialOverride = serialOverride;
@@ -1579,8 +1582,7 @@
      * a public no-argument constructor. If so, then that constructor is used
      * when deserializing in the {@link DefaultObjectCoder}; if not then
      * Persistit uses private methods within the JDK to emulate standard Java
-     * serialization logic. TODO Link to Serialization section of
-     * user_guide.html.
+     * serialization logic.
      * </p>
      * <p>
      * Default value is <code>false</code><br />
@@ -1589,6 +1591,8 @@
      * 
      * @param constructorOverride
      *            the constructorOverride to set
+     * @see <a
+     *      href="http://www.akiban.com/ak-docs/admin/persistit/Serialization.html">Serialization</a>
      */
     public void setConstructorOverride(final boolean constructorOverride) {
         this.constructorOverride = constructorOverride;
@@ -1791,7 +1795,7 @@
     /**
      * Return the value defined by {@link #setAppendOnly}
      * 
-     * @return the whether to start Persistit in append-only mode
+     * @return <true>true</code> if append-only mode is enabled at startup
      */
     public boolean isAppendOnly() {
         return appendOnly;
@@ -1807,77 +1811,73 @@
      * </p>
      * <p>
      * Default value is <code>false</code><br />
-     * Property name is {@value #APPEND_ONLY_PROPERTY}
+     * Property name is {@value #APPEND_ONLY_PROPERTY_NAME}
      * </p>
      * 
      * @param appendOnly
-     *            <code>true</code> to start Persistit in append-only only
+     *            <code>true</code> to start Persistit in append-only mode
      */
     public void setAppendOnly(final boolean appendOnly) {
         this.appendOnly = appendOnly;
     }
 
     /**
-     * Return the path name defined by {@link #getBufferInventoryPathName}
-     * 
-     * @return the path where file to warm-up Persistit with sample buffer data
-     *         is stored
-     */
-    public String getBufferInventoryPathName() {
-        return bufferInventoryPathName;
-    }
-
-    /**
-     * <p>
-     * Control where Persistit stores its buffer inventory. In this mode
-     * Persistit restarts with information from the last run. This method
-     * initializes the warm-up file at the specified location, if none is
-     * specified the buffer pool is not warmed up on start-up.
-     * </p>
-     * <p>
-     * Default value is <code>null</code><br />
-     * Property name is {@value #BUFFER_INVENTORY_PROPERTY_NAME}
-     * </p>
-     * 
-     * @param pathName
-     *            the name of the path to the warm-up file
-     */
-    public void setBufferInventoryPathName(final String pathName) {
-        bufferInventoryPathName = pathName;
-
-    }
-
-    /**
-     * Return polling interval defined by
-     * {@link #getBufferInventoryPollingInterval}
-     * 
-     * @return the number of seconds wait between warm-up polls
-     */
-    public long getBufferInventoryPollingInterval() {
-        return bufferInventoryPollInterval;
-    }
-
-    /**
-     * <p>
-     * Control the number of seconds between each poll for the cache warm-up
-     * option in Persistit.
-     * </p>
-     * <p>
-     * Default value is <code>3000</code><br />
-     * Property name is {@value #BUFFER_POLLING_INTERVAL_PROPERTY}
-     * </p>
-     * 
-     * @param seconds
-     *            the number of seconds between polls
-     */
-    public void setBufferInventoryPollingInterval(final long seconds) {
-        bufferInventoryPollInterval = Util.rangeCheck(seconds, 60L, Long.MAX_VALUE) * 1000L;
+     * Return the value defined by {@link #setBufferInventoryEnabled}
+     * 
+     * @return <code>true</code> if periodic buffer pool inventory recording is
+     *         enabled
+     */
+    public boolean isBufferInventoryEnabled() {
+        return bufferInventoryEnabled;
+    }
+
+    /**
+     * <p>
+     * Control whether Persistit periodically records an inventory of its buffer
+     * pools to enable buffer pool preloading on a subsequent startup.
+     * </p>
+     * <p>
+     * Default value is <code>false</code><br />
+     * Property name is {@value #BUFFER_INVENTORY_PROPERTY_NAME}
+     * 
+     * @param bufferInventoryEnabled
+     *            <code>true</code> to enable periodic buffer inventory behavior
+     */
+    public void setBufferInventoryEnabled(final boolean bufferInventoryEnabled) {
+        this.bufferInventoryEnabled = bufferInventoryEnabled;
+    }
+
+    /**
+     * Return the value defined by {@link #setBufferPreloadEnabled}
+     * 
+     * @return <code>true</code> if the option to preload buffer pools is
+     *         enabled
+     */
+    public boolean isBufferPreloadEnabled() {
+        return bufferPreloadEnabled;
+    }
+
+    /**
+     * <p>
+     * Control whether Persistit attempts to preload (warm up) the buffer pools
+     * by preloading pages recorded in a previously generated inventory.
+     * </p>
+     * <p>
+     * Default value is <code>false</code><br />
+     * Property name is {@value #BUFFER_INVENTORY_PROPERTY_NAME}
+     * 
+     * @param bufferPreloadEnabled
+     *            <code>true</code> to enable buffer pool preloading during
+     *            startup
+     */
+    public void setBufferPreloadEnabled(final boolean bufferPreloadEnabled) {
+        this.bufferPreloadEnabled = bufferPreloadEnabled;
     }
 
     /**
      * Return the value defined by {@link #setIgnoreMissingVolumes(boolean)}
      * 
-     * @return the whether to start Persistit in ignore-missing-volumes mode
+     * @return <code>true</code>to enable ignore-missing-volumes mode
      */
     public boolean isIgnoreMissingVolumes() {
         return ignoreMissingVolumes;

=== modified file 'src/main/java/com/persistit/Exchange.java'
--- src/main/java/com/persistit/Exchange.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/Exchange.java	2012-08-24 14:04:53 +0000
@@ -1529,6 +1529,9 @@
                             storedLength &= MVV.STORE_LENGTH_MASK;
                             spareValue.setEncodedSize(storedLength);
 
+                            // TODO remove after debugging
+                            MVV.verify(_persistit.getTransactionIndex(), spareBytes, 0, storedLength);
+
                             if (spareValue.getEncodedSize() > maxSimpleValueSize) {
                                 newLongRecordPointerMVV = getLongRecordHelper().storeLongRecord(spareValue,
                                         _transaction.isActive());
@@ -3698,6 +3701,8 @@
             buffer.nextKey(_spareKey2, buffer.toKeyBlock(0));
             _value.setPointerValue(page);
             _value.setPointerPageType(buffer.getPageType());
+            buffer.release();
+            buffer = null;
             storeInternal(_spareKey2, _value, level + 1, Exchange.StoreOptions.NONE);
             return true;
         } finally {

=== modified file 'src/main/java/com/persistit/IOMeter.java'
--- src/main/java/com/persistit/IOMeter.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/IOMeter.java	2012-08-24 14:04:53 +0000
@@ -61,15 +61,16 @@
 
     private final static int READ_PAGE_FROM_VOLUME = 1;
     private final static int READ_PAGE_FROM_JOURNAL = 2;
-    private final static int COPY_PAGE_TO_VOLUME = 3;
-    private final static int WRITE_PAGE_TO_JOURNAL = 4;
-    private final static int WRITE_TX_TO_JOURNAL = 5;
-    private final static int WRITE_OTHER_TO_JOURNAL = 6;
-    private final static int EVICT_PAGE_FROM_POOL = 7;
-    private final static int FLUSH_JOURNAL = 8;
-    private final static int GET_PAGE = 9;
+    private final static int COPY_PAGE_FROM_JOURNAL = 3;
+    private final static int COPY_PAGE_TO_VOLUME = 4;
+    private final static int WRITE_PAGE_TO_JOURNAL = 5;
+    private final static int WRITE_TX_TO_JOURNAL = 6;
+    private final static int WRITE_OTHER_TO_JOURNAL = 7;
+    private final static int EVICT_PAGE_FROM_POOL = 8;
+    private final static int FLUSH_JOURNAL = 9;
+    private final static int GET_PAGE = 10;
 
-    private final static int ITEM_COUNT = 10;
+    private final static int ITEM_COUNT = 11;
 
     private long _quiescentIOthreshold = DEFAULT_QUIESCENT_IO_THRESHOLD;
 
@@ -266,7 +267,7 @@
 
                 if (analyzePages
                         && (op == WRITE_PAGE_TO_JOURNAL || op == READ_PAGE_FROM_JOURNAL || op == READ_PAGE_FROM_VOLUME
-                                || op == COPY_PAGE_TO_VOLUME || op == EVICT_PAGE_FROM_POOL)) {
+                                || op == COPY_PAGE_FROM_JOURNAL || op == COPY_PAGE_TO_VOLUME || op == EVICT_PAGE_FROM_POOL)) {
                     final long handle = (volumeHandle << 48) + pageAddress;
                     List<Event> list = events.get(handle);
                     if (list == null) {
@@ -291,6 +292,12 @@
         }
     }
 
+    public void chargeCopyPageFromJournal(final Volume volume, final long pageAddress, final int size,
+            final long journalAddress, final int urgency) {
+        charge(size, COPY_PAGE_FROM_JOURNAL);
+        log(COPY_PAGE_FROM_JOURNAL, volume, pageAddress, size, journalAddress, 0);
+    }
+
     public void chargeCopyPageToVolume(final Volume volume, final long pageAddress, final int size,
             final long journalAddress, final int urgency) {
         charge(size, COPY_PAGE_TO_VOLUME);

=== modified file 'src/main/java/com/persistit/JournalManager.java'
--- src/main/java/com/persistit/JournalManager.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/JournalManager.java	2012-08-24 14:04:53 +0000
@@ -77,6 +77,7 @@
     final static int URGENT = 10;
     final static int ALMOST_URGENT = 8;
     final static int HALF_URGENT = 5;
+    final static int URGENT_COMMIT_DELAY = 50; // delay in ms
     private final static long NS_PER_MS = 1000000L;
     private final static int IO_MEASUREMENT_CYCLES = 8;
 
@@ -140,13 +141,13 @@
      * requires more space than is available in the current journal file, it
      * will advance to the start of the next journal file.
      */
-    private long _currentAddress;
+    private volatile long _currentAddress;
 
     /**
      * Smallest journal address at which a record still needed is located.
      * Initially zero, increases as journal files are consumed and deleted.
      */
-    private long _baseAddress;
+    private volatile long _baseAddress;
 
     private final Map<Long, FileChannel> _journalFileChannels = new HashMap<Long, FileChannel>();
 
@@ -191,6 +192,8 @@
 
     private final TransactionPlayerListener _listener = new ProactiveRollbackListener();
 
+    private final AtomicBoolean _writePagePruning = new AtomicBoolean(true);
+
     private final AtomicBoolean _rollbackPruning = new AtomicBoolean(true);
 
     /*
@@ -202,8 +205,6 @@
 
     private volatile int _copiesPerCycle = DEFAULT_COPIES_PER_CYCLE;
 
-    private volatile int _pageListSizeBase = DEFAULT_PAGE_MAP_SIZE_BASE;
-
     private volatile long _copierTimestampLimit = Long.MAX_VALUE;
 
     private volatile long _earliestCommittedTimestamp = Long.MAX_VALUE;
@@ -423,6 +424,11 @@
         _rollbackPruning.set(rollbackPruning);
     }
 
+    @Override
+    public void setWritePagePruningEnabled(final boolean writePruning) {
+        _writePagePruning.set(writePruning);
+    }
+
     public JournalManager(final Persistit persistit) {
         _persistit = persistit;
     }
@@ -443,6 +449,11 @@
     }
 
     @Override
+    public boolean isWritePagePruningEnabled() {
+        return _writePagePruning.get();
+    }
+
+    @Override
     public String getJournalFilePath() {
         return _journalFilePath;
     }
@@ -539,16 +550,35 @@
      * @return the JOURNAL_COPIER urgency on a scale of 0 to 10
      */
     @Override
-    public synchronized int urgency() {
+    public int urgency() {
         if (_copyFast.get()) {
             return URGENT;
         }
-        int urgency = _pageList.size() / _pageListSizeBase;
-        final int journalFileCount = (int) (_currentAddress / _blockSize - _baseAddress / _blockSize);
-        if (!_appendOnly.get() && journalFileCount > 1) {
-            urgency += journalFileCount - 1;
-        }
-        return Math.min(urgency, URGENT);
+
+        final int journalFileCount = (int) ((_currentAddress - _baseAddress) / _blockSize);
+        if (journalFileCount < HALF_URGENT) {
+            return journalFileCount;
+        }
+        return Math.min(URGENT, journalFileCount - HALF_URGENT);
+    }
+
+    /**
+     * Introduce delay into an application thread when JOURNAL_COPIER thread is
+     * behind. The amount of delay depends on the value returned by
+     * {@link #urgency()}. When that value is {@value #URGENT} then the delay is
+     * {@value #URGENT_COMMIT_DELAY} milliseconds.
+     * 
+     * @throws PersistitInterruptedException
+     */
+    public void throttle() throws PersistitInterruptedException {
+        final int urgency = urgency();
+        if (!_appendOnly.get()) {
+            if (urgency == URGENT) {
+                Util.sleep(URGENT_COMMIT_DELAY);
+            } else if (urgency >= ALMOST_URGENT) {
+                Util.sleep(URGENT_COMMIT_DELAY / 4);
+            }
+        }
     }
 
     int handleForVolume(final Volume volume) throws PersistitException {
@@ -690,6 +720,29 @@
         final ByteBuffer bb = buffer.getByteBuffer();
 
         final Volume volume = buffer.getVolume();
+        final PageNode pn = lookupUpPageNode(pageAddress, volume);
+        if (pn == null) {
+            return false;
+        }
+        bb.position(0);
+        final long recordPageAddress = readPageBufferFromJournal(pn, bb);
+        _persistit.getIOMeter().chargeReadPageFromJournal(volume, pageAddress, bufferSize, pn.getJournalAddress(),
+                buffer.getIndex());
+
+        if (pageAddress != recordPageAddress) {
+            throw new CorruptJournalException("Record at " + pn + " is not volume/page " + buffer.toString());
+        }
+
+        if (bb.limit() != bufferSize) {
+            throw new CorruptJournalException("Record at " + pn + " is wrong size: expected/actual=" + bufferSize + "/"
+                    + bb.limit());
+        }
+        _readPageCount++;
+        buffer.getVolume().getStatistics().bumpReadCounter();
+        return true;
+    }
+
+    PageNode lookupUpPageNode(final long pageAddress, final Volume volume) {
         PageNode pnLookup = null;
         synchronized (this) {
             final Integer volumeHandle = _volumeToHandleMap.get(volume);
@@ -699,7 +752,7 @@
         }
 
         if (pnLookup == null) {
-            return false;
+            return null;
         }
 
         final PageNode pn = new PageNode(pnLookup.getVolumeHandle(), pnLookup.getPageAddress(),
@@ -714,25 +767,9 @@
          * new checkpoints and that keeps the copier from deleting it.
          */
         if (pnLookup.isInvalid()) {
-            return false;
-        }
-
-        bb.position(0);
-        final long recordPageAddress = readPageBufferFromJournal(pn, bb);
-        _persistit.getIOMeter().chargeReadPageFromJournal(volume, pageAddress, bufferSize, pn.getJournalAddress(),
-                buffer.getIndex());
-
-        if (pageAddress != recordPageAddress) {
-            throw new CorruptJournalException("Record at " + pn + " is not volume/page " + buffer.toString());
-        }
-
-        if (bb.limit() != bufferSize) {
-            throw new CorruptJournalException("Record at " + pn + " is wrong size: expected/actual=" + bufferSize + "/"
-                    + bb.limit());
-        }
-        _readPageCount++;
-        buffer.getVolume().getStatistics().bumpReadCounter();
-        return true;
+            return null;
+        }
+        return pn;
     }
 
     private long readPageBufferFromJournal(final PageNode pn, final ByteBuffer bb) throws PersistitIOException,
@@ -974,6 +1011,14 @@
         //
         force();
         //
+        // Make sure all copied pages have been flushed to disk.
+        //
+        for (final Volume vol : _volumeToHandleMap.keySet()) {
+            if (vol.isOpened()) {
+                vol.getStorage().force();
+            }
+        }
+        //
         // Prepare room for CP.OVERHEAD bytes in the journal. If doing so
         // started a new journal file then there's no need to write another
         // CP record.
@@ -1736,6 +1781,9 @@
      * three commit modes: SOFT, HARD and GROUP. The two parameters represent
      * time intervals in milliseconds.
      * 
+     * @param flushedTimestamp
+     *            a timestamp taken after the transaction buffer belonging to
+     *            the current transaction has been flushed.
      * @param leadTime
      *            time interval in milliseconds by which to anticipate I/O
      *            completion; the method will return as soon as the I/O
@@ -1750,10 +1798,11 @@
      * @throws PersistitInterruptedException
      */
 
-    void waitForDurability(final long leadTime, final long stallTime) throws PersistitException {
+    void waitForDurability(final long flushedTimestamp, final long leadTime, final long stallTime)
+            throws PersistitException {
         final JournalFlusher flusher = _flusher;
         if (flusher != null) {
-            flusher.waitForDurability(leadTime, stallTime);
+            flusher.waitForDurability(flushedTimestamp, leadTime, stallTime);
         } else {
             throw new IllegalStateException("JOURNAL_FLUSHER is not running");
         }
@@ -1829,6 +1878,10 @@
 
         PageNode _previous;
 
+        PageNode(final int volumeHandle, final long pageAddress) {
+            this(volumeHandle, pageAddress, Long.MIN_VALUE, -1);
+        }
+
         PageNode(final int volumeHandle, final long pageAddress, final long journalAddress, final long timestamp) {
             this._volumeHandle = volumeHandle;
             this._pageAddress = pageAddress;
@@ -1950,8 +2003,20 @@
 
             @Override
             public int compare(final PageNode a, final PageNode b) {
-                return a.getJournalAddress() > b.getJournalAddress() ? 1 : a.getJournalAddress() < b
-                        .getJournalAddress() ? -1 : 0;
+                if (!a.isInvalid() && !b.isInvalid()) {
+                    return a.getJournalAddress() > b.getJournalAddress() ? 1 : a.getJournalAddress() < b
+                            .getJournalAddress() ? -1 : 0;
+                }
+                if (a.isInvalid() && !b.isInvalid()) {
+                    return -1;
+                }
+                if (!a.isInvalid() && b.isInvalid()) {
+                    return 1;
+                }
+                if (a._volumeHandle != b._volumeHandle) {
+                    return a._volumeHandle - b._volumeHandle;
+                }
+                return a._pageAddress > b._pageAddress ? 1 : a._pageAddress < b._pageAddress ? -1 : 0;
             }
         };
 
@@ -2138,7 +2203,7 @@
             int divisor = 1;
 
             if (iom.recentCharge() < iom.getQuiescentIOthreshold()) {
-                divisor = URGENT - HALF_URGENT;
+                divisor = HALF_URGENT;
             } else if (urgency > HALF_URGENT) {
                 divisor = urgency - HALF_URGENT;
             }
@@ -2176,16 +2241,16 @@
 
         /**
          * General method used to wait for durability. {@See
-         * JournalManager#waitForDurability(long, long)}.
+         * JournalManager#waitForDurability(long, long, long)}.
          * 
          * @throws PersistitInterruptedException
          */
-        private void waitForDurability(final long leadTime, final long stallTime) throws PersistitException {
+        private void waitForDurability(final long flushedTimestamp, final long leadTime, final long stallTime)
+                throws PersistitException {
             /*
              * Commit is known durable once the JOURNAL_FLUSHER thread has
-             * posted a timestamp value to _endTimestamp larger than this.
+             * posted an _endTimestamp larger than flushedTimestamp.
              */
-            final long timestamp = _persistit.getTimestampAllocator().getCurrentTimestamp();
             final long now = System.nanoTime();
 
             while (true) {
@@ -2208,7 +2273,7 @@
                     endTimestamp = _endTimestamp;
                     startTime = _startTime;
                     endTime = _endTime;
-                    if (timestamp > startTimestamp && startTimestamp > endTimestamp) {
+                    if (flushedTimestamp > startTimestamp && startTimestamp > endTimestamp) {
                         estimatedRemainingIoNanos = Math.max(startTime + _expectedIoTime - now, 0);
                     }
                     if (startTimestamp == _startTimestamp && endTimestamp == _endTimestamp) {
@@ -2217,7 +2282,7 @@
                     Util.spinSleep();
                 }
 
-                if (endTimestamp > timestamp && startTimestamp > timestamp) {
+                if (endTimestamp > flushedTimestamp && startTimestamp > flushedTimestamp) {
                     /*
                      * Done - commit is fully durable
                      */
@@ -2233,7 +2298,7 @@
                 }
 
                 long estimatedNanosToFinish = Math.max(estimatedRemainingIoNanos, 0);
-                if (startTimestamp < timestamp) {
+                if (startTimestamp < flushedTimestamp) {
                     estimatedNanosToFinish += remainingSleepNanos + _expectedIoTime;
                 }
 
@@ -2262,7 +2327,7 @@
                             if (_lock.readLock().tryLock(NS_PER_MS, TimeUnit.NANOSECONDS)) {
                                 _lock.readLock().unlock();
                             }
-                        } catch (InterruptedException e) {
+                        } catch (final InterruptedException e) {
                             throw new PersistitInterruptedException(e);
                         }
                     }
@@ -2287,7 +2352,7 @@
                     _waitLoopsWithNoDelay.incrementAndGet();
                 }
             }
-            if (_lastExceptionTimestamp > timestamp) {
+            if (_lastExceptionTimestamp > flushedTimestamp) {
                 final Exception e = _lastException;
                 if (e instanceof PersistitException) {
                     throw (PersistitException) e;
@@ -2428,6 +2493,8 @@
                     continue;
                 }
                 pageAddress = readPageBufferFromJournal(stablePageNode, bb);
+                _persistit.getIOMeter().chargeCopyPageFromJournal(volumeRef, pageAddress, volume.getPageSize(),
+                        stablePageNode.getJournalAddress(), urgency());
             } catch (final PersistitException ioe) {
                 _persistit
                         .getAlertMonitor()
@@ -2455,8 +2522,6 @@
         Volume volume = null;
         int handle = -1;
 
-        final HashSet<Volume> volumes = new HashSet<Volume>();
-
         for (final Iterator<PageNode> iterator = list.iterator(); iterator.hasNext();) {
             if (_closed.get() && !_copyFast.get() || _appendOnly.get()) {
                 list.clear();
@@ -2512,15 +2577,11 @@
                 throw ioe;
             }
 
-            volumes.add(volume);
             _copiedPageCount++;
             _persistit.getIOMeter().chargeCopyPageToVolume(volume, pageAddress, volume.getPageSize(),
-                    pageNode.getJournalAddress(), _copyFast.get() ? URGENT : urgency());
+                    pageNode.getJournalAddress(), urgency());
         }
 
-        for (final Volume vol : volumes) {
-            vol.getStorage().force();
-        }
     }
 
     private void cleanupForCopy(final List<PageNode> list) throws PersistitException {
@@ -2567,6 +2628,7 @@
             // Detect first journal address holding a mapped page
             // required for recovery
             //
+
             for (final PageNode pageNode : _pageMap.values()) {
                 //
                 // If there are multiple versions, we need to keep
@@ -2584,9 +2646,9 @@
             //
             for (final Iterator<TransactionMapItem> iterator = _liveTransactionMap.values().iterator(); iterator
                     .hasNext();) {
-                final TransactionMapItem ts = iterator.next();
-                if (ts.getStartAddress() < recoveryBoundary) {
-                    recoveryBoundary = ts.getStartAddress();
+                final TransactionMapItem item = iterator.next();
+                if (item.getStartAddress() < recoveryBoundary) {
+                    recoveryBoundary = item.getStartAddress();
                 }
             }
 
@@ -2749,7 +2811,6 @@
 
         @Override
         public void store(final long address, final long timestamp, final Exchange exchange) throws PersistitException {
-            final TransactionStatus ts = _persistit.getTransactionIndex().getStatus(timestamp);
             exchange.prune();
         }
 
@@ -2817,6 +2878,7 @@
     /**
      * Extend ArrayList to export the removeRange method.
      */
+    @SuppressWarnings("serial")
     static class RangeRemovingArrayList<T> extends ArrayList<T> {
         @Override
         public void removeRange(final int fromIndex, final int toIndex) {

=== added file 'src/main/java/com/persistit/JournalManagerBench.java'
--- src/main/java/com/persistit/JournalManagerBench.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/persistit/JournalManagerBench.java	2012-08-24 14:04:53 +0000
@@ -0,0 +1,186 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.persistit;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+import com.persistit.util.ArgParser;
+
+/**
+ * Benchmark for primitive I/O simulating HARD (durable) commit. This code is
+ * intended to explore two elements:
+ * 
+ * (1) Pre-extending the journal file (so that FileChannel.force(false) usually
+ * does not need to write any metadata.
+ * 
+ * (2) Performing I/O in fixed-length blocks so that to write a some bytes the
+ * file system does not first need to read existing data from disk.
+ * 
+ * Parameters
+ * 
+ * align - smallest unit of I/O (default = 1) datapath - directory in which fake
+ * journal file will be written (default = /tmp/persistit_test_data) buffersize
+ * - emulated journal buffer size (default = 64M)
+ * 
+ * 
+ * @author peter
+ * 
+ */
+public class JournalManagerBench {
+
+    private final long NS_PER_S = 1000000000L;
+    private final byte[] NULLS = new byte[65536];
+
+    private final String[] ARG_TEMPLATE = new String[] { "duration|int:10:10:86400|Duration of test in seconds",
+            "policy|String:HARD|Commit policy: SOFT, HARD or GROUP",
+            "datapath|String:/tmp/persistit_test_data|Datapath property",
+            "buffersize|int:64:1:1024|Emulated journal buffer size in MBytes",
+            "extension|int:0:0:1024|MBytes by which to extend file when full",
+            "prealloc|int:0:0:1024|Preallocated file size in MBytes",
+            "align|int:1:1:65536|Blocking factor for I/O size",
+            "recsize|int:123:64:65536|Emulated transaction record size" };
+
+    final ByteBuffer buffer;
+    final ArgParser ap;
+
+    private File file;
+    private FileChannel fc;
+
+    private long writeAddress = 0;
+    private long currentAddress = 0;
+
+    long count = 0;
+    long minTime = Long.MAX_VALUE;
+    long maxTime = Long.MIN_VALUE;
+
+    final byte[] bytes = new byte[65536];
+
+    public static void main(final String[] args) throws Exception {
+        final JournalManagerBench jmb = new JournalManagerBench(args);
+        jmb.runTest();
+    }
+
+    private JournalManagerBench(final String[] args) throws Exception {
+        ap = new ArgParser("JournalManagerBench", args, ARG_TEMPLATE).strict();
+        buffer = ByteBuffer.allocate(ap.getIntValue("buffersize") * 1024 * 1024);
+    }
+
+    @SuppressWarnings("resource")
+    private void runTest() throws Exception {
+        file = new File(ap.getStringValue("datapath"), "JManBench_TestFile");
+        fc = new RandomAccessFile(file, "rw").getChannel();
+        preallocateFile(ap.getIntValue("prealloc") * 1024 * 1024);
+        for (int i = 0; i < bytes.length; i++) {
+            bytes[i] = (byte) ('-');
+        }
+        final int align = ap.getIntValue("align");
+        final long extension = ap.getIntValue("extension") * 1024 * 1024;
+
+        final long start = System.nanoTime();
+        final long expires = start + ap.getIntValue("duration") * NS_PER_S;
+        long now = System.nanoTime();
+
+        while (now < expires) {
+            doOneCycle(now - start, align, extension, 100);
+            final long then = System.nanoTime();
+            count++;
+            minTime = Math.min(minTime, then - now);
+            maxTime = Math.max(maxTime, then - now);
+            now = then;
+        }
+        final long elapsed = now - start;
+        System.out.printf("%,d commits took %,dms at a rate of %,d/second minimum time=%,dns maximumTime=%,dns\n",
+                count, elapsed, (count * NS_PER_S) / elapsed, minTime, maxTime);
+
+    }
+
+    private void preallocateFile(final long size) throws Exception {
+        if (size > 0 && fc.size() > size) {
+            System.out.printf("Truncating file %s from %,d to %,d\n", file, fc.size(), size);
+            fc.truncate(size);
+        } else if (fc.size() < size) {
+            System.out.printf("Preallocating file %s to size %,d ", file, size);
+            while (true) {
+                long remaining = size - fc.size();
+                if (remaining <= 0) {
+                    break;
+                }
+                if (remaining > buffer.capacity()) {
+                    remaining = buffer.capacity();
+                    long unaligned = fc.size() % 16384;
+                    if (unaligned > 0) {
+                        remaining = remaining - (16384 - unaligned);
+                    }
+                }
+                buffer.position(0).limit((int) remaining);
+                fc.write(buffer, fc.size());
+                System.out.print(".");
+            }
+            fc.force(true);
+            System.out.println("done");
+        }
+    }
+
+    private void doOneCycle(final long time, final int align, final long extension, final int size) throws Exception {
+        // Make a fake transaction record
+        String header = String.format("\nsize=%06d count=%06d time=%012d\n", size, count, time);
+        byte[] b = header.getBytes();
+        System.arraycopy(b, 0, bytes, 0, b.length);
+
+        // Add the record, possibly offset to maintaining alignment
+        int toRewrite = (int) (currentAddress - writeAddress);
+        buffer.position(toRewrite);
+        buffer.put(bytes, 0, size);
+        boolean extended = false;
+
+        int position = buffer.position();
+
+        // If extension is needed, add those bytes
+        long currentSize;
+        if (extension > 0 && writeAddress + buffer.position() > (currentSize = fc.size())) {
+            long newSize = currentSize + extension;
+            if (newSize - writeAddress > buffer.capacity()) {
+                newSize = writeAddress + buffer.capacity();
+                assert newSize > currentSize;
+            }
+            int add = (int) (newSize - writeAddress - buffer.position());
+            while (add > 0) {
+                buffer.put(NULLS, 0, Math.min(NULLS.length, add));
+                add -= NULLS.length;
+            }
+            extended = true;
+        }
+
+        // Write and force the buffer
+
+        buffer.flip();
+        fc.write(buffer, writeAddress);
+        fc.force(extended);
+
+        // Align the bytes to the beginning of the buffer as needed
+
+        currentAddress = writeAddress + position;
+        buffer.limit(position);
+        position = (position / align) * align;
+        buffer.position(position);
+        buffer.compact();
+        writeAddress += position;
+    }
+
+}

=== modified file 'src/main/java/com/persistit/JournalTool.java'
--- src/main/java/com/persistit/JournalTool.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/JournalTool.java	2012-08-24 14:04:53 +0000
@@ -688,7 +688,10 @@
         }
 
         protected void flush() {
-            write(sb.toString());
+            if (sb.length() > 0) {
+                write(sb.toString());
+                sb.setLength(0);
+            }
         }
 
         protected void write(final String msg) {
@@ -908,7 +911,6 @@
             long address = from + PM.OVERHEAD;
             int index = 0;
             int loaded = 0;
-            sb.setLength(0);
             long lastPage = Long.MAX_VALUE;
             int lastVolumeHandle = Integer.MAX_VALUE;
             for (int remaining = count; remaining > 0; remaining--) {
@@ -930,10 +932,7 @@
                 final long journalAddress = PM.getEntryJournalAddress(_readBuffer, index);
                 if (_selectedPages.isSelected(pageAddress) && _selectedTimestamps.isSelected(pageTimestamp)) {
                     if (pageAddress != lastPage || volumeHandle != lastVolumeHandle) {
-                        if (sb.length() > 0) {
-                            flush();
-                            sb.setLength(0);
-                        }
+                        flush();
                         lastPage = pageAddress;
                         lastVolumeHandle = volumeHandle;
                         appendf("-- %5d:%,12d: ", volumeHandle, pageAddress);
@@ -953,7 +952,6 @@
             long address = from + TM.OVERHEAD;
             int index = 0;
             int loaded = 0;
-            sb.setLength(0);
             for (int remaining = count; remaining > 0; remaining--) {
                 if (index == loaded) {
                     read(address, Math.min(_readBuffer.capacity(), remaining * TM.ENTRY_SIZE));
@@ -972,7 +970,6 @@
                 appendf("--  start %,12d  commit %,12d  @%,18d %s", startTimestamp, commitTimestamp, journalAddress,
                         isCommitted ? "committed" : "uncommitted");
                 flush();
-                sb.setLength(0);
                 index++;
             }
         }

=== modified file 'src/main/java/com/persistit/MVV.java'
--- src/main/java/com/persistit/MVV.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/MVV.java	2012-08-24 14:04:53 +0000
@@ -19,6 +19,7 @@
 import static com.persistit.Buffer.LONGREC_SIZE;
 import static com.persistit.Buffer.LONGREC_TYPE;
 import static com.persistit.TransactionIndex.vh2ts;
+import static com.persistit.TransactionStatus.ABORTED;
 import static com.persistit.TransactionStatus.UNCOMMITTED;
 
 import java.util.List;
@@ -307,7 +308,7 @@
          * simply replaced.
          */
         else {
-            Debug.$assert0.t(verify(target, targetOffset, targetLength));
+            assert verify(target, targetOffset, targetLength);
             /*
              * Search for the matching version.
              */
@@ -600,6 +601,37 @@
         return true;
     }
 
+    static boolean verify(final TransactionIndex ti, final byte[] bytes, final int offset, final int length) {
+        if (!isArrayMVV(bytes, offset, length)) {
+            /*
+             * Not an MVV
+             */
+            return true;
+        }
+        int from = offset + 1;
+        final long lastVersion = -1;
+        while (from < offset + length) {
+            final int vlength = getLength(bytes, from);
+            final long version = getVersion(bytes, from);
+            if (vlength < 0 || from + vlength + LENGTH_PER_VERSION > offset + length) {
+                return false;
+            }
+            if (version < lastVersion) {
+                try {
+                    final long lastVersionTc = ti.commitStatus(lastVersion, UNCOMMITTED, 0);
+                    assert lastVersionTc == ABORTED;
+                } catch (final InterruptedException e) {
+                    // ignore
+                } catch (final TimeoutException e) {
+                    // ignore
+                }
+            }
+            assert version != lastVersion;
+            from += vlength + LENGTH_PER_VERSION;
+        }
+        return true;
+    }
+
     /**
      * Search for a known version within a MVV array. If the version is found
      * within the array, copy the contents out to the target and return the

=== modified file 'src/main/java/com/persistit/MediatedFileChannel.java'
--- src/main/java/com/persistit/MediatedFileChannel.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/MediatedFileChannel.java	2012-08-24 14:04:53 +0000
@@ -342,7 +342,7 @@
      * 
      * @param channel
      */
-    void setErrorInjectingChannelForTests(final FileChannel channel) {
+    void injectChannelForTests(final FileChannel channel) {
         ((TestChannelInjector) channel).setChannel(_channel);
         _channel = channel;
     }

=== modified file 'src/main/java/com/persistit/Persistit.java'
--- src/main/java/com/persistit/Persistit.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/Persistit.java	2012-08-24 14:04:53 +0000
@@ -403,6 +403,7 @@
 
     private final AtomicBoolean _suspendShutdown = new AtomicBoolean(false);
     private final AtomicBoolean _suspendUpdates = new AtomicBoolean(false);
+    private final AtomicBoolean _enableBufferInventory = new AtomicBoolean(false);
 
     private UtilControl _localGUI;
 
@@ -588,9 +589,7 @@
                 initializeVolumes();
                 startJournal();
                 startBufferPools();
-                if (_configuration.getBufferInventoryPathName() != null) {
-                    warmupBufferPools();
-                }
+                preloadBufferPools();
                 finishRecovery();
                 startCheckpointManager();
                 startTransactionIndexPollTask();
@@ -699,6 +698,7 @@
         _defaultSplitPolicy = _configuration.getSplitPolicy();
         _defaultJoinPolicy = _configuration.getJoinPolicy();
         _defaultCommitPolicy = _configuration.getCommitPolicy();
+        _enableBufferInventory.set(_configuration.isBufferInventoryEnabled());
     }
 
     void startCheckpointManager() {
@@ -719,10 +719,24 @@
         }
     }
 
-    void warmupBufferPools() throws PersistitException {
-        final String pathName = _configuration.getBufferInventoryPathName();
-        for (final BufferPool pool : _bufferPoolTable.values()) {
-            pool.warmupBufferPool(pathName, pool.toString());
+    void recordBufferPoolInventory() {
+        final long timestamp = _timestampAllocator.getCurrentTimestamp();
+        if (_enableBufferInventory.get()) {
+            for (final BufferPool pool : _bufferPoolTable.values()) {
+                try {
+                    pool.recordBufferInventory(timestamp);
+                } catch (PersistitException e) {
+                    getLogBase().bufferInventoryException.log(e);
+                }
+            }
+        }
+    }
+
+    void preloadBufferPools() throws PersistitException {
+        if (_configuration.isBufferPreloadEnabled()) {
+            for (final BufferPool pool : _bufferPoolTable.values()) {
+                pool.preloadBufferInventory();
+            }
         }
     }
 
@@ -974,8 +988,6 @@
      * 
      * @throws IllegalStateException
      */
-
-    // TODO - why not one pool.
     public void releaseExchange(final Exchange exchange, final boolean secure) {
         if (exchange == null) {
             return;
@@ -1638,6 +1650,7 @@
                     }
                 }
             }
+            recordBufferPoolInventory();
 
             /*
              * The copier is responsible for background pruning of aborted
@@ -1899,9 +1912,9 @@
             checkFatal();
             throw new PersistitClosedException();
         }
-        if (Thread.currentThread().isInterrupted()) {
-            throw new PersistitInterruptedException(new InterruptedException());
-        }
+        // if (Thread.currentThread().isInterrupted()) {
+        // throw new PersistitInterruptedException(new InterruptedException());
+        // }
     }
 
     void checkFatal() throws FatalErrorException {

=== modified file 'src/main/java/com/persistit/Transaction.java'
--- src/main/java/com/persistit/Transaction.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/Transaction.java	2012-08-24 14:04:53 +0000
@@ -854,21 +854,27 @@
             sequence(COMMIT_FLUSH_A);
             _commitTimestamp = _persistit.getTimestampAllocator().updateTimestamp();
             sequence(COMMIT_FLUSH_C);
+            long flushedTimetimestamp = 0;
             boolean committed = false;
             try {
+
                 if (flushTransactionBuffer(false)) {
-                    _persistit.getJournalManager().waitForDurability(
-                            policy == CommitPolicy.SOFT ? _persistit.getTransactionCommitLeadTime() : 0,
-                            policy == CommitPolicy.GROUP ? _persistit.getTransactionCommitStallTime() : 0);
+                    flushedTimetimestamp = _persistit.getTimestampAllocator().getCurrentTimestamp();
                 }
                 committed = true;
             } finally {
-
                 _persistit.getTransactionIndex().notifyCompleted(_transactionStatus,
                         committed ? _commitTimestamp : TransactionStatus.ABORTED);
                 _commitCompleted = committed;
                 _rollbackPending = _rollbackCompleted = !committed;
             }
+
+            _persistit.getJournalManager().throttle();
+            if (flushedTimetimestamp != 0) {
+                _persistit.getJournalManager().waitForDurability(flushedTimetimestamp,
+                        policy == CommitPolicy.SOFT ? _persistit.getTransactionCommitLeadTime() : 0,
+                        policy == CommitPolicy.GROUP ? _persistit.getTransactionCommitStallTime() : 0);
+            }
         }
     }
 

=== modified file 'src/main/java/com/persistit/TransactionIndex.java'
--- src/main/java/com/persistit/TransactionIndex.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/TransactionIndex.java	2012-08-24 14:04:53 +0000
@@ -50,7 +50,7 @@
     /**
      * Interval in milliseconds for updating the active transaction cache
      */
-    final static long POLLING_TASK_INTERVAL = 50;
+    final static long POLLING_TASK_INTERVAL = 10;
 
     /**
      * Default threshold value for moving long-running transactions to the

=== modified file 'src/main/java/com/persistit/logging/LogBase.java'
--- src/main/java/com/persistit/logging/LogBase.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/logging/LogBase.java	2012-08-24 14:04:53 +0000
@@ -244,6 +244,15 @@
     @Message("ERROR|Too many journal files %,d")
     public final LogItem tooManyJournalFilesError = PersistitLogMessage.empty();
 
+    @Message("INFO|Preloading buffer pool inventory recorded at %tc")
+    public final LogItem bufferInventoryLoad = PersistitLogMessage.empty();
+
+    @Message("INFO|Preloaded %,d of %,d buffers")
+    public final LogItem bufferInventoryProgress = PersistitLogMessage.empty();
+
+    @Message("WARNING|Exception while writing buffer pool inventory %s")
+    public final LogItem bufferInventoryException = PersistitLogMessage.empty();
+
     public static String recurring(final String message, final int count, final long duration) {
         return String.format(RECURRING, message, count, duration);
     }

=== modified file 'src/main/java/com/persistit/mxbeans/IOMeterMXBean.java'
--- src/main/java/com/persistit/mxbeans/IOMeterMXBean.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/mxbeans/IOMeterMXBean.java	2012-08-24 14:04:53 +0000
@@ -59,12 +59,12 @@
      * 
      */
     public final static String[] OPERATION_NAMES = { "Unknown", "Read page from Volume", "Read page from Journal",
-            "Copy page from journal to volume", "Write page from Journal", "Write Transaction to Journal", "Other",
-            "Evict page from pool", "Flush journal", "Get page" };
-
-    public final static String[] OPERATIONS = { "??", "RV", "RJ", "CC", "WJ", "TJ", "XX", "EV", "FJ", "GP" };
-
-    public final static String[] SUMMARY_ITEMS = { "CC", "RV", "RJ", "WJ", "EV", "FJ" };
+            "Copy page from journal", "Copy page to volume", "Write page from Journal", "Write Transaction to Journal",
+            "Other", "Evict page from pool", "Flush journal", "Get page" };
+
+    public final static String[] OPERATIONS = { "??", "RV", "RJ", "CJ", "CV", "WJ", "TJ", "XX", "EV", "FJ", "GP" };
+
+    public final static String[] SUMMARY_ITEMS = { "CJ", "CV", "RV", "RJ", "WJ", "EV", "FJ" };
 
     /**
      * @return the quiescentIOthreshold

=== modified file 'src/main/java/com/persistit/mxbeans/JournalManagerMXBean.java'
--- src/main/java/com/persistit/mxbeans/JournalManagerMXBean.java	2012-08-24 14:04:53 +0000
+++ src/main/java/com/persistit/mxbeans/JournalManagerMXBean.java	2012-08-24 14:04:53 +0000
@@ -207,6 +207,12 @@
     @Description("True to enable pruning of rolled-back transactions")
     boolean isRollbackPruningEnabled();
 
+    @Description("True to enable pruning when writing pages to journal")
+    void setWritePagePruningEnabled(boolean rollbackPruning);
+
+    @Description("True to enable pruning when writing pages to journal")
+    boolean isWritePagePruningEnabled();
+
     @Description("Degree of urgency for copying pages: 0-10")
     int urgency();
 

=== modified file 'src/test/java/com/persistit/AccumulatorMemoryTest.java'
--- src/test/java/com/persistit/AccumulatorMemoryTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/AccumulatorMemoryTest.java	2012-08-24 14:04:53 +0000
@@ -21,8 +21,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class AccumulatorMemoryTest extends PersistitUnitTestCase {
 
     @Test

=== modified file 'src/test/java/com/persistit/AccumulatorRecoveryTest.java'
--- src/test/java/com/persistit/AccumulatorRecoveryTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/AccumulatorRecoveryTest.java	2012-08-24 14:04:53 +0000
@@ -31,7 +31,6 @@
 import com.persistit.TransactionPlayer.TransactionPlayerListener;
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.RollbackException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class AccumulatorRecoveryTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/AccumulatorTest.java'
--- src/test/java/com/persistit/AccumulatorTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/AccumulatorTest.java	2012-08-24 14:04:53 +0000
@@ -33,7 +33,6 @@
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.TimeoutException;
 import com.persistit.unit.ConcurrentUtil;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class AccumulatorTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/AlertMonitorTest.java'
--- src/test/java/com/persistit/AlertMonitorTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/AlertMonitorTest.java	2012-08-24 14:04:53 +0000
@@ -31,7 +31,6 @@
 import com.persistit.logging.PersistitLevel;
 import com.persistit.logging.PersistitLogMessage.LogItem;
 import com.persistit.logging.PersistitLogger;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class AlertMonitorTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/BackupTaskTest.java'
--- src/test/java/com/persistit/BackupTaskTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/BackupTaskTest.java	2012-08-24 14:04:53 +0000
@@ -29,7 +29,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class BackupTaskTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/BufferMaxPack.java'
--- src/test/java/com/persistit/BufferMaxPack.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/BufferMaxPack.java	2012-08-24 14:04:53 +0000
@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 import com.persistit.ValueHelper.RawValueWriter;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class BufferMaxPack extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/BufferPoolTest.java'
--- src/test/java/com/persistit/BufferPoolTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/BufferPoolTest.java	2012-08-24 14:04:53 +0000
@@ -26,7 +26,6 @@
 import org.junit.Test;
 
 import com.persistit.BufferPool.BufferHolder;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class BufferPoolTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/BufferTest.java'
--- src/test/java/com/persistit/BufferTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/BufferTest.java	2012-08-24 14:04:53 +0000
@@ -27,7 +27,6 @@
 import com.persistit.exception.RebalanceException;
 import com.persistit.policy.JoinPolicy;
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class BufferTest extends PersistitUnitTestCase {
     int leftn;

=== modified file 'src/test/java/com/persistit/BufferTest2.java'
--- src/test/java/com/persistit/BufferTest2.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/BufferTest2.java	2012-08-24 14:04:53 +0000
@@ -33,7 +33,6 @@
 import com.persistit.exception.RebalanceException;
 import com.persistit.policy.JoinPolicy;
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class BufferTest2 extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/Bug1003578Test.java'
--- src/test/java/com/persistit/Bug1003578Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug1003578Test.java	2012-08-24 14:04:53 +0000
@@ -27,7 +27,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /**
  * https://bugs.launchpad.net/akiban-persistit/+bug/1003578

=== modified file 'src/test/java/com/persistit/Bug1017957Test.java'
--- src/test/java/com/persistit/Bug1017957Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug1017957Test.java	2012-08-24 14:04:53 +0000
@@ -23,7 +23,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 /**

=== modified file 'src/test/java/com/persistit/Bug1018526Test.java'
--- src/test/java/com/persistit/Bug1018526Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug1018526Test.java	2012-08-24 14:04:53 +0000
@@ -27,7 +27,6 @@
 import org.junit.Test;
 
 import com.persistit.JournalManager.TreeDescriptor;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class Bug1018526Test extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/Bug706132Test.java'
--- src/test/java/com/persistit/Bug706132Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug706132Test.java	2012-08-24 14:04:53 +0000
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /*
  * Stress10 with 1K pages exhibited a failure in which a value was simply not

=== modified file 'src/test/java/com/persistit/Bug708592Test.java'
--- src/test/java/com/persistit/Bug708592Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug708592Test.java	2012-08-24 14:04:53 +0000
@@ -21,7 +21,6 @@
 import org.junit.Test;
 
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /*
  * Got this while loading sample data. Apparently the new PACK split policy 

=== modified file 'src/test/java/com/persistit/Bug739533Test.java'
--- src/test/java/com/persistit/Bug739533Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug739533Test.java	2012-08-24 14:04:53 +0000
@@ -17,8 +17,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug739533Test extends PersistitUnitTestCase {
 
     private final String _volumeName = "persistit";

=== modified file 'src/test/java/com/persistit/Bug777918Test.java'
--- src/test/java/com/persistit/Bug777918Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug777918Test.java	2012-08-24 14:04:53 +0000
@@ -25,7 +25,6 @@
 import com.persistit.exception.MissingThreadException;
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.TestException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 import com.persistit.util.Util;
 

=== modified file 'src/test/java/com/persistit/Bug790709Test.java'
--- src/test/java/com/persistit/Bug790709Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug790709Test.java	2012-08-24 14:04:53 +0000
@@ -20,8 +20,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * Bug 790709 This happened on-site at XXX with the halo release. The server
  * process was running with assertions enabled. The DELETE statement that failed

=== modified file 'src/test/java/com/persistit/Bug870352Test.java'
--- src/test/java/com/persistit/Bug870352Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug870352Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug870352Test extends PersistitUnitTestCase {
 
     @Test

=== modified file 'src/test/java/com/persistit/Bug877656Test.java'
--- src/test/java/com/persistit/Bug877656Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug877656Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug877656Test extends PersistitUnitTestCase {
 
     @Test

=== modified file 'src/test/java/com/persistit/Bug882219Test.java'
--- src/test/java/com/persistit/Bug882219Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug882219Test.java	2012-08-24 14:04:53 +0000
@@ -26,7 +26,6 @@
 import com.persistit.Transaction.CommitPolicy;
 import com.persistit.exception.PersistitIOException;
 import com.persistit.exception.PersistitInterruptedException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /**
  * Interrupting a thread while it is performing a read or write closes the

=== modified file 'src/test/java/com/persistit/Bug885477Test.java'
--- src/test/java/com/persistit/Bug885477Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug885477Test.java	2012-08-24 14:04:53 +0000
@@ -21,8 +21,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * Suppose a persistit tree has keys (1, 10), (1, 20), (2, 30). If an exchange's
  * key is (1), then traverse(GTEQ, false) should traverse to the first record,

=== modified file 'src/test/java/com/persistit/Bug889850Test.java'
--- src/test/java/com/persistit/Bug889850Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug889850Test.java	2012-08-24 14:04:53 +0000
@@ -17,8 +17,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * 
  * From akiban-server 0.81:

=== modified file 'src/test/java/com/persistit/Bug911849Test.java'
--- src/test/java/com/persistit/Bug911849Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug911849Test.java	2012-08-24 14:04:53 +0000
@@ -25,7 +25,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.RollbackException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /**
  * TableStatusRecoveryIT and RenameTableIT fail intermittently

=== modified file 'src/test/java/com/persistit/Bug912514Test.java'
--- src/test/java/com/persistit/Bug912514Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug912514Test.java	2012-08-24 14:04:53 +0000
@@ -20,8 +20,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * https://bugs.launchpad.net/akiban-persistit/+bug/912514
  * 

=== modified file 'src/test/java/com/persistit/Bug915594Test.java'
--- src/test/java/com/persistit/Bug915594Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug915594Test.java	2012-08-24 14:04:53 +0000
@@ -21,8 +21,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * I did an update that failed due to constraint violation and the transaction
  * was rolled back.

=== modified file 'src/test/java/com/persistit/Bug918909Test.java'
--- src/test/java/com/persistit/Bug918909Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug918909Test.java	2012-08-24 14:04:53 +0000
@@ -22,8 +22,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * At a DP site experiencing very low insert rates the JournalManager was
  * failing to delete obsolete journal files. This was noticed just prior to the

=== modified file 'src/test/java/com/persistit/Bug920754Test.java'
--- src/test/java/com/persistit/Bug920754Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug920754Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug920754Test extends PersistitUnitTestCase {
     /*
      * https://bugs.launchpad.net/akiban-persistit/+bug/920754

=== modified file 'src/test/java/com/persistit/Bug923790Test.java'
--- src/test/java/com/persistit/Bug923790Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug923790Test.java	2012-08-24 14:04:53 +0000
@@ -19,7 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.util.Util;
 
 /**

=== modified file 'src/test/java/com/persistit/Bug927701Test.java'
--- src/test/java/com/persistit/Bug927701Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug927701Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * Failure detected during TPCC testing. Upon restarting server, the following
  * error was emitted:
@@ -54,7 +52,7 @@
     @Test
     public void testBug927701() throws Exception {
         final JournalManager jman = _persistit.getJournalManager();
-        _persistit.getCleanupManager().setMinimumPruningDelay(0);
+        disableBackgroundCleanup();
         jman.setCopierInterval(1000);
         final long blockSize = jman.getBlockSize();
         /*

=== modified file 'src/test/java/com/persistit/Bug932097Test.java'
--- src/test/java/com/persistit/Bug932097Test.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/Bug932097Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug932097Test extends PersistitUnitTestCase {
 
     @Test

=== modified file 'src/test/java/com/persistit/Bug937877Test.java'
--- src/test/java/com/persistit/Bug937877Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug937877Test.java	2012-08-24 14:04:53 +0000
@@ -24,7 +24,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.util.ThreadSequencer;
 
 public class Bug937877Test extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/Bug942669Test.java'
--- src/test/java/com/persistit/Bug942669Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug942669Test.java	2012-08-24 14:04:53 +0000
@@ -26,8 +26,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug942669Test extends PersistitUnitTestCase {
 
     // See https://bugs.launchpad.net/akiban-persistit/+bug/942669

=== modified file 'src/test/java/com/persistit/Bug947182Test.java'
--- src/test/java/com/persistit/Bug947182Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug947182Test.java	2012-08-24 14:04:53 +0000
@@ -38,7 +38,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class Bug947182Test extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/Bug974589Test.java'
--- src/test/java/com/persistit/Bug974589Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug974589Test.java	2012-08-24 14:04:53 +0000
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class Bug974589Test extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/Bug980292Test.java'
--- src/test/java/com/persistit/Bug980292Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug980292Test.java	2012-08-24 14:04:53 +0000
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class Bug980292Test extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/Bug989202Test.java'
--- src/test/java/com/persistit/Bug989202Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug989202Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 /**
  * Persistit rev: 284
  * 

=== modified file 'src/test/java/com/persistit/Bug992801Test.java'
--- src/test/java/com/persistit/Bug992801Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug992801Test.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class Bug992801Test extends PersistitUnitTestCase {
     /*
      * https://bugs.launchpad.net/akiban-persistit/+bug/992801

=== modified file 'src/test/java/com/persistit/Bug996241Test.java'
--- src/test/java/com/persistit/Bug996241Test.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/Bug996241Test.java	2012-08-24 14:04:53 +0000
@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class Bug996241Test extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/ClassIndexTest.java'
--- src/test/java/com/persistit/ClassIndexTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/ClassIndexTest.java	2012-08-24 14:04:53 +0000
@@ -31,7 +31,6 @@
 import org.junit.Test;
 
 import com.persistit.Transaction.CommitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.util.Util;
 
 public class ClassIndexTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/CleanupManagerTest.java'
--- src/test/java/com/persistit/CleanupManagerTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/CleanupManagerTest.java	2012-08-24 14:04:53 +0000
@@ -24,7 +24,6 @@
 
 import com.persistit.CleanupManager.CleanupAction;
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class CleanupManagerTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/CommandLineTest.java'
--- src/test/java/com/persistit/CommandLineTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/CommandLineTest.java	2012-08-24 14:04:53 +0000
@@ -29,7 +29,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.util.Util;
 
 public class CommandLineTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/ConfigurationTest.java'
--- src/test/java/com/persistit/ConfigurationTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/ConfigurationTest.java	2012-08-24 14:04:53 +0000
@@ -33,7 +33,6 @@
 import org.junit.Test;
 
 import com.persistit.Configuration.BufferPoolConfiguration;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class ConfigurationTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/CorruptVolumeTest.java'
--- src/test/java/com/persistit/CorruptVolumeTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/CorruptVolumeTest.java	2012-08-24 14:04:53 +0000
@@ -23,7 +23,6 @@
 
 import com.persistit.exception.CorruptVolumeException;
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class CorruptVolumeTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/DumpTaskTest.java'
--- src/test/java/com/persistit/DumpTaskTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/DumpTaskTest.java	2012-08-24 14:04:53 +0000
@@ -32,7 +32,6 @@
 import com.persistit.JournalRecord.IV;
 import com.persistit.JournalRecord.PA;
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class DumpTaskTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/FastIndexTest.java'
--- src/test/java/com/persistit/FastIndexTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/FastIndexTest.java	2012-08-24 14:04:53 +0000
@@ -22,7 +22,6 @@
 import org.junit.Test;
 
 import com.persistit.ValueHelper.RawValueWriter;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class FastIndexTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/FatalErrorExceptionTest.java'
--- src/test/java/com/persistit/FatalErrorExceptionTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/FatalErrorExceptionTest.java	2012-08-24 14:04:53 +0000
@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 import com.persistit.Persistit.FatalErrorException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class FatalErrorExceptionTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/IOFailureTest.java'
--- src/test/java/com/persistit/IOFailureTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/IOFailureTest.java	2012-08-24 14:04:53 +0000
@@ -34,7 +34,6 @@
 import com.persistit.exception.CorruptVolumeException;
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.PersistitIOException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class IOFailureTest extends PersistitUnitTestCase {
@@ -57,7 +56,7 @@
 
     private ErrorInjectingFileChannel errorInjectingChannel(final FileChannel channel) {
         final ErrorInjectingFileChannel eimfc = new ErrorInjectingFileChannel();
-        ((MediatedFileChannel) channel).setErrorInjectingChannelForTests(eimfc);
+        ((MediatedFileChannel) channel).injectChannelForTests(eimfc);
         return eimfc;
     }
 

=== modified file 'src/test/java/com/persistit/IOMeterChargeBenchmark.java'
--- src/test/java/com/persistit/IOMeterChargeBenchmark.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/IOMeterChargeBenchmark.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class IOMeterChargeBenchmark extends PersistitUnitTestCase {
 
     private final static long SECOND = 1000000000;

=== modified file 'src/test/java/com/persistit/InsertSequenceTest.java'
--- src/test/java/com/persistit/InsertSequenceTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/InsertSequenceTest.java	2012-08-24 14:04:53 +0000
@@ -22,7 +22,6 @@
 import com.persistit.Exchange.Sequence;
 import com.persistit.exception.PersistitException;
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class InsertSequenceTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/IntegrityCheckTest.java'
--- src/test/java/com/persistit/IntegrityCheckTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/IntegrityCheckTest.java	2012-08-24 14:04:53 +0000
@@ -25,7 +25,6 @@
 import org.junit.Test;
 
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class IntegrityCheckTest extends PersistitUnitTestCase {
 
@@ -55,7 +54,7 @@
     @Test
     public void testSimpleMvvTree() throws Exception {
         final Exchange ex = _persistit.getExchange(_volumeName, "mvv", true);
-        _persistit.getCleanupManager().setPollInterval(Integer.MAX_VALUE);
+        disableBackgroundCleanup();
 
         transactionalStore(ex);
 
@@ -76,7 +75,7 @@
     @Test
     public void testBrokenKeySequence() throws Exception {
         final Exchange ex = _persistit.getExchange(_volumeName, "mvv", true);
-        _persistit.getCleanupManager().setPollInterval(Integer.MAX_VALUE);
+        disableBackgroundCleanup();
 
         transactionalStore(ex);
 
@@ -90,7 +89,7 @@
     @Test
     public void testBrokenMVVs() throws Exception {
         final Exchange ex = _persistit.getExchange(_volumeName, "mvv", true);
-        _persistit.getCleanupManager().setPollInterval(Integer.MAX_VALUE);
+        disableBackgroundCleanup();
         transactionalStore(ex);
         corrupt2(ex);
         final IntegrityCheck icheck = icheck();
@@ -155,6 +154,7 @@
     @Test
     public void testPruneRemovesAbortedTransactionStatus() throws Exception {
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
 
         for (int i = 0; i < 10; i++) {
             final Exchange ex = _persistit.getExchange(_volumeName, "mvv" + i, true);
@@ -179,9 +179,7 @@
         _persistit = new Persistit();
         _persistit.getRecoveryManager().setRecoveryDisabledForTestMode(true);
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
-        _persistit.getCleanupManager().setMinimumPruningDelay(0); // no
-                                                                  // background
-                                                                  // pruningIn
+        disableBackgroundCleanup();
         _persistit.initialize(properties);
 
         for (int i = 0; i < 10; i++) {

=== modified file 'src/test/java/com/persistit/JournalManagerTest.java'
--- src/test/java/com/persistit/JournalManagerTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/JournalManagerTest.java	2012-08-24 14:04:53 +0000
@@ -47,7 +47,6 @@
 import com.persistit.TransactionPlayer.TransactionPlayerListener;
 import com.persistit.exception.PersistitException;
 import com.persistit.unit.ConcurrentUtil.ThrowingRunnable;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 import com.persistit.util.Util;
 
@@ -89,6 +88,7 @@
         jman.writeCheckpointToJournal(checkpoint1);
         final Exchange exchange = _persistit.getExchange(_volumeName, "JournalManagerTest1", false);
         volume.getTree("JournalManagerTest1", false).resetHandle();
+
         assertTrue(exchange.next(true));
         final long[] timestamps = new long[100];
 
@@ -299,6 +299,7 @@
     public void testRollback() throws Exception {
         // Allow test to control when pruning will happen
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
         final Transaction txn = _persistit.getTransaction();
         for (int i = 0; i < 10; i++) {
             txn.begin();
@@ -349,6 +350,8 @@
     public void testRollbackLongRecords() throws Exception {
         // Allow test to control when pruning will happen
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
+
         final Volume volume = _persistit.getVolume(_volumeName);
         final Transaction txn = _persistit.getTransaction();
         for (int i = 0; i < 10; i++) {

=== modified file 'src/test/java/com/persistit/KeyHistogramTest.java'
--- src/test/java/com/persistit/KeyHistogramTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/KeyHistogramTest.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class KeyHistogramTest extends PersistitUnitTestCase {
 
     private final String _volumeName = "persistit";

=== modified file 'src/test/java/com/persistit/MVCCPruneBufferTest.java'
--- src/test/java/com/persistit/MVCCPruneBufferTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/MVCCPruneBufferTest.java	2012-08-24 14:04:53 +0000
@@ -144,7 +144,7 @@
 
     @Test
     public void testPruneLongRecordsSimple() throws Exception {
-        _persistit.getCleanupManager().setPollInterval(-1);
+        disableBackgroundCleanup();
         trx1.begin();
         storeLongMVV(ex1, "x");
         trx1.commit();
@@ -156,7 +156,7 @@
 
     @Test
     public void testPruneLongRecordsWithRollback() throws Exception {
-        _persistit.getCleanupManager().setPollInterval(-1);
+        disableBackgroundCleanup();
         /*
          * Start a concurrent transaction to prevent pruning during the store
          * operations.
@@ -182,7 +182,7 @@
 
     @Test
     public void induceBug1006576() throws Exception {
-        _persistit.getCleanupManager().setPollInterval(-1);
+        disableBackgroundCleanup();
         trx1.begin();
         storeLongMVV(ex1, "x");
         storeLongMVV(ex1, "y");
@@ -203,7 +203,7 @@
 
     @Test
     public void induceBug1005206() throws Exception {
-        _persistit.getCleanupManager().setPollInterval(-1);
+        disableBackgroundCleanup();
         trx1.begin();
         storeLongMVV(ex1, "x");
 
@@ -297,6 +297,27 @@
         }
     }
 
+    @Test
+    public void testWritePagePrune() throws Exception {
+        final Transaction txn = _persistit.getTransaction();
+        try {
+            txn.begin();
+            storeNewVersion(1);
+            txn.commit();
+        } finally {
+            txn.end();
+        }
+        final Volume volume = _persistit.getVolume(TEST_VOLUME_NAME);
+        final Buffer buffer = volume.getPool().get(volume, 3, true, true);
+        assertTrue("Should have multiple MVV records", buffer.getMvvCount() > 2);
+        _persistit.getJournalManager().setWritePagePruningEnabled(true);
+        _persistit.getTransactionIndex().updateActiveTransactionCache();
+        buffer.setDirtyAtTimestamp(_persistit.getCurrentTimestamp());
+        buffer.writePage();
+        assertTrue("Should no more than one MVV record", buffer.getMvvCount() < 2);
+        buffer.release();
+    }
+
     private void storeNewVersion(final int cycle) throws Exception {
         final Exchange exchange = _persistit.getExchange(TEST_VOLUME_NAME,
                 String.format("%s%04d", TEST_TREE_NAME, cycle), true);

=== modified file 'src/test/java/com/persistit/MVCCTestBase.java'
--- src/test/java/com/persistit/MVCCTestBase.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/MVCCTestBase.java	2012-08-24 14:04:53 +0000
@@ -24,7 +24,6 @@
 
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.PersistitInterruptedException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.util.Util;
 
 public abstract class MVCCTestBase extends PersistitUnitTestCase {

=== added file 'src/test/java/com/persistit/PersistitUnitTestCase.java'
--- src/test/java/com/persistit/PersistitUnitTestCase.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/persistit/PersistitUnitTestCase.java	2012-08-24 14:04:53 +0000
@@ -0,0 +1,136 @@
+/**
+ * Copyright © 2005-2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.persistit;
+
+import java.lang.ref.WeakReference;
+import java.util.Map;
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+
+import com.persistit.exception.PersistitException;
+import com.persistit.unit.UnitTestProperties;
+
+public abstract class PersistitUnitTestCase {
+
+    private final static long TEN_SECONDS = 10L * 1000L * 1000L * 1000L;
+
+    protected final static String RED_FOX = "The quick red fox jumped over the lazy brown dog.";
+
+    protected static String createString(final int exactLength) {
+        final StringBuilder sb = new StringBuilder(exactLength);
+        // Simple 0..9a..z string
+        for (int i = 0; i < 36; ++i) {
+            sb.append(Character.forDigit(i, 36));
+        }
+        final String numAndLetters = sb.toString();
+        while (sb.length() < exactLength) {
+            sb.append(numAndLetters);
+        }
+        return sb.toString().substring(0, exactLength);
+    }
+
+    protected Persistit _persistit = new Persistit();
+
+    protected Properties getProperties(final boolean cleanup) {
+        return UnitTestProperties.getProperties(cleanup);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        checkNoPersistitThreads();
+        _persistit.initialize(getProperties(true));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        final WeakReference<Persistit> ref = new WeakReference<Persistit>(_persistit);
+        _persistit.close(false);
+        _persistit = null;
+
+        if (!doesRefBecomeNull(ref)) {
+            System.out.println("Persistit has a leftover strong reference");
+        }
+        checkNoPersistitThreads();
+    }
+
+    public void runAllTests() throws Exception {
+
+    }
+
+    public void setPersistit(final Persistit persistit) {
+        _persistit = persistit;
+    }
+
+    protected void initAndRunTest() throws Exception {
+        setUp();
+        try {
+            runAllTests();
+        } catch (final Throwable t) {
+            t.printStackTrace();
+        } finally {
+            tearDown();
+        }
+    }
+
+    private final static String[] PERSISTIT_THREAD_NAMES = { "CHECKPOINT_WRITER", "JOURNAL_COPIER", "JOURNAL_FLUSHER",
+            "PAGE_WRITER", "TXN_UPDATE" };
+
+    protected boolean checkNoPersistitThreads() {
+        boolean alive = false;
+        final Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
+        for (final Thread t : map.keySet()) {
+            final String name = t.getName();
+            for (final String p : PERSISTIT_THREAD_NAMES) {
+                if (name.contains(p)) {
+                    alive = true;
+                    System.err.println("Thread " + t + " is still alive");
+                }
+            }
+        }
+        return alive;
+    }
+
+    protected void safeCrashAndRestoreProperties() throws PersistitException {
+        final Properties properties = _persistit.getProperties();
+        _persistit.flush();
+        _persistit.crash();
+        _persistit = new Persistit();
+        _persistit.initialize(properties);
+    }
+
+    protected void crashWithoutFlushAndRestoreProperties() throws PersistitException {
+        final Properties properties = _persistit.getProperties();
+        _persistit.crash();
+        _persistit = new Persistit();
+        _persistit.initialize(properties);
+    }
+
+    public static boolean doesRefBecomeNull(final WeakReference<?> ref) throws InterruptedException {
+        final long expires = System.nanoTime() + TEN_SECONDS;
+        while (ref.get() != null && System.nanoTime() < expires) {
+            System.gc();
+            Thread.sleep(10);
+        }
+        return ref.get() == null;
+    }
+
+    protected void disableBackgroundCleanup() {
+        _persistit.getCleanupManager().setPollInterval(-1);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
+    }
+}

=== modified file 'src/test/java/com/persistit/RecoveryTest.java'
--- src/test/java/com/persistit/RecoveryTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/RecoveryTest.java	2012-08-24 14:04:53 +0000
@@ -37,7 +37,6 @@
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.RollbackException;
 import com.persistit.exception.TransactionFailedException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class RecoveryTest extends PersistitUnitTestCase {
@@ -53,6 +52,8 @@
     public void setUp() throws Exception {
         super.setUp();
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
+
     }
 
     @Override

=== modified file 'src/test/java/com/persistit/SplitPolicyTest.java'
--- src/test/java/com/persistit/SplitPolicyTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/SplitPolicyTest.java	2012-08-24 14:04:53 +0000
@@ -24,7 +24,6 @@
 
 import com.persistit.Exchange.Sequence;
 import com.persistit.policy.SplitPolicy;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class SplitPolicyTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/StatisticsTaskTest.java'
--- src/test/java/com/persistit/StatisticsTaskTest.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/StatisticsTaskTest.java	2012-08-24 14:04:53 +0000
@@ -27,7 +27,6 @@
 
 import com.persistit.StatisticsTask.Display;
 import com.persistit.StatisticsTask.Stat;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class StatisticsTaskTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/StressRunner.java'
--- src/test/java/com/persistit/StressRunner.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/StressRunner.java	2012-08-24 14:04:53 +0000
@@ -31,6 +31,7 @@
 import com.persistit.stress.MixtureTxn1;
 import com.persistit.stress.MixtureTxn2;
 import com.persistit.stress.PersistitMap1;
+import com.persistit.stress.PreloadMixtureTxn1;
 import com.persistit.stress.StartStop;
 import com.persistit.stress.Stress10Suite;
 import com.persistit.stress.Stress12txnSuite;
@@ -79,6 +80,7 @@
         _classes.add(Stress12txnSuite.class);
         _classes.add(Stress4Suite.class);
         _classes.add(Stress8txnSuite.class);
+        _classes.add(PreloadMixtureTxn1.class);
     }
 
     private final static String DURATION_PARAM = "duration=";

=== added file 'src/test/java/com/persistit/TrackingFileChannel.java'
--- src/test/java/com/persistit/TrackingFileChannel.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/persistit/TrackingFileChannel.java	2012-08-24 14:04:53 +0000
@@ -0,0 +1,175 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.persistit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.persistit.MediatedFileChannel.TestChannelInjector;
+
+/**
+ * <p>
+ * A {@link FileChannel} implementation that simulates IOExceptions under
+ * control of a unit test program. This class implements only those methods used
+ * by Persistit; many methods of FileChannel throw
+ * {@link UnsupportedOperationException}.
+ * </p>
+ * 
+ * @author peter
+ * 
+ */
+class TrackingFileChannel extends FileChannel implements TestChannelInjector {
+
+    volatile FileChannel _channel;
+
+    final List<Long> _writePositions = new ArrayList<Long>();
+
+    final List<Long> _readPositions = new ArrayList<Long>();
+
+    @Override
+    public void setChannel(final FileChannel channel) {
+        _channel = channel;
+    }
+
+    @Override
+    protected void implCloseChannel() throws IOException {
+        _channel.close();
+    }
+
+    @Override
+    public void force(final boolean metaData) throws IOException {
+        _channel.force(metaData);
+    }
+
+    @Override
+    public int read(final ByteBuffer byteBuffer, final long position) throws IOException {
+        _readPositions.add(position);
+        return _channel.read(byteBuffer, position);
+    }
+
+    @Override
+    public long size() throws IOException {
+        return _channel.size();
+    }
+
+    @Override
+    public FileChannel truncate(final long size) throws IOException {
+        return _channel.truncate(size);
+    }
+
+    @Override
+    public synchronized FileLock tryLock(final long position, final long size, final boolean shared) throws IOException {
+        return _channel.tryLock(position, size, shared);
+    }
+
+    @Override
+    public int write(final ByteBuffer byteBuffer, final long position) throws IOException {
+        _writePositions.add(position);
+        final int written = _channel.write(byteBuffer, position);
+        return written;
+    }
+
+    /*
+     * --------------------------------
+     * 
+     * Persistit does not use these methods and so they are Unsupported. Note
+     * that it would be difficult to support the relative read/write methods
+     * because the channel size is unavailable after it is closed. Therefore a
+     * client of this class must maintain its own position counter and cannot
+     * use the relative-addressing calls.
+     * 
+     * --------------------------------
+     */
+    @Override
+    public FileLock lock(final long position, final long size, final boolean shared) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public MappedByteBuffer map(final MapMode arg0, final long arg1, final long arg2) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long position() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public FileChannel position(final long arg0) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int read(final ByteBuffer byteBuffer) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long read(final ByteBuffer[] arg0, final int arg1, final int arg2) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long transferFrom(final ReadableByteChannel arg0, final long arg1, final long arg2) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long transferTo(final long arg0, final long arg1, final WritableByteChannel arg2) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int write(final ByteBuffer byteBuffer) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long write(final ByteBuffer[] arg0, final int arg1, final int arg2) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    public List<Long> getWritePositionList() {
+        return _writePositions;
+    }
+
+    public List<Long> getReadPositionList() {
+        return _readPositions;
+    }
+
+    public void assertSequential(boolean read, boolean forward) {
+        final List<Long> list = read ? _readPositions : _writePositions;
+        long previous = forward ? -1 : Long.MAX_VALUE;
+        for (final Long position : list) {
+            if (forward) {
+                assertTrue("Position should be larger", position > previous);
+            } else {
+                assertTrue("Position should be smaller", position < previous);
+            }
+        }
+    }
+}

=== modified file 'src/test/java/com/persistit/TransactionLifetimeTest.java'
--- src/test/java/com/persistit/TransactionLifetimeTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/TransactionLifetimeTest.java	2012-08-24 14:04:53 +0000
@@ -24,7 +24,6 @@
 
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.TreeNotFoundException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /**
  * Attempt to cover all cases from the pseudo graph below and ensure that the
@@ -63,6 +62,8 @@
         _persistit.getCheckpointManager().setCheckpointIntervalNanos(FIVE_MIN_NANOS);
         super.setUp();
         _persistit.getJournalManager().setRollbackPruningEnabled(false);
+        _persistit.getJournalManager().setWritePagePruningEnabled(false);
+
     }
 
     @Test
@@ -354,6 +355,8 @@
                     currentInLiveMap = false;
                     safeCrashAndRestoreProperties();
                     _persistit.getJournalManager().setRollbackPruningEnabled(false);
+                    _persistit.getJournalManager().setWritePagePruningEnabled(false);
+
                 } else {
                     fail("Unknown test node: " + curNode);
                 }

=== modified file 'src/test/java/com/persistit/TransactionTest2.java'
--- src/test/java/com/persistit/TransactionTest2.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/TransactionTest2.java	2012-08-24 14:04:53 +0000
@@ -33,7 +33,6 @@
 import com.persistit.exception.PersistitIOException;
 import com.persistit.exception.PersistitInterruptedException;
 import com.persistit.exception.RollbackException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 /**
  * Demonstrates the use of Persistit Transactions. This demo runs multiple

=== modified file 'src/test/java/com/persistit/TreeLifetimeTest.java'
--- src/test/java/com/persistit/TreeLifetimeTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/TreeLifetimeTest.java	2012-08-24 14:04:53 +0000
@@ -45,7 +45,6 @@
 import com.persistit.JournalManager.TreeDescriptor;
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.TreeNotFoundException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class TreeLifetimeTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/TreeTest2.java'
--- src/test/java/com/persistit/TreeTest2.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/TreeTest2.java	2012-08-24 14:04:53 +0000
@@ -23,8 +23,6 @@
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class TreeTest2 extends PersistitUnitTestCase {
 
     final static int COUNT = 10000;

=== modified file 'src/test/java/com/persistit/ValueTest7.java'
--- src/test/java/com/persistit/ValueTest7.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/ValueTest7.java	2012-08-24 14:04:53 +0000
@@ -23,7 +23,6 @@
 import org.junit.Test;
 
 import com.persistit.Value.Version;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class ValueTest7 extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/VolumeTest.java'
--- src/test/java/com/persistit/VolumeTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/VolumeTest.java	2012-08-24 14:04:53 +0000
@@ -32,7 +32,6 @@
 import com.persistit.exception.InUseException;
 import com.persistit.exception.InvalidVolumeSpecificationException;
 import com.persistit.exception.VolumeFullException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 
 public class VolumeTest extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/WarmupTest.java'
--- src/test/java/com/persistit/WarmupTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/WarmupTest.java	2012-08-24 14:04:53 +0000
@@ -16,52 +16,105 @@
 package com.persistit;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Properties;
 
 import org.junit.Test;
 
-import com.persistit.unit.PersistitUnitTestCase;
-
 public class WarmupTest extends PersistitUnitTestCase {
 
+    @Override
+    protected Properties getProperties(final boolean cleanup) {
+        final Properties p = super.getProperties(cleanup);
+        p.setProperty("bufferinventory", "true");
+        p.setProperty("bufferpreload", "true");
+        return p;
+    }
+
     @Test
     public void testWarmup() throws Exception {
         Exchange ex = _persistit.getExchange("persistit", "WarmupTest", true);
+        final BufferPool pool = ex.getBufferPool();
         for (int i = 1; i <= 1000; i++) {
             ex.getValue().put(RED_FOX);
             ex.clear().append(i).store();
         }
 
-        // Assumption: only one buffer pool is created
-        int poolCount = 0;
-        String pathName = "";
         final Buffer[] buff = new Buffer[100];
-        for (final BufferPool p : _persistit.getBufferPoolHashMap().values()) {
-            poolCount = p.getBufferCount();
-            pathName = p.toString();
-            for (int i = 0; i < poolCount; ++i) {
-                buff[i] = p.getBufferCopy(i);
-            }
-        }
-
-        final Properties properties = _persistit.getProperties();
-        ex = null;
-        _persistit.close();
-
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
-
-        int poolCount1 = 0;
-        for (final BufferPool p : _persistit.getBufferPoolHashMap().values()) {
-            poolCount1 = p.getBufferCount();
-            for (int i = 0; i < poolCount1; ++i) {
-                final Buffer bufferCopy = p.getBufferCopy(i);
-                assertEquals(bufferCopy.getPageAddress(), buff[i].getPageAddress());
-                assertEquals(bufferCopy.getPageType(), buff[i].getPageType());
-                assertEquals(bufferCopy.getBufferSize(), buff[i].getBufferSize());
-            }
-        }
-        assertEquals(poolCount, poolCount1);
+        for (int i = 0; i < pool.getBufferCount(); ++i) {
+            buff[i] = pool.getBufferCopy(i);
+        }
+
+        final Configuration config = _persistit.getConfiguration();
+        ex = null;
+        _persistit.close();
+
+        _persistit = new Persistit();
+        _persistit.initialize(config);
+
+        for (int i = 0; i < pool.getBufferCount(); ++i) {
+            final Buffer bufferCopy = pool.getBufferCopy(i);
+            assertEquals(bufferCopy.getPageAddress(), buff[i].getPageAddress());
+            assertEquals(bufferCopy.getPageType(), buff[i].getPageType());
+            assertEquals(bufferCopy.getBufferSize(), buff[i].getBufferSize());
+        }
+    }
+
+    @Test
+    public void readOrderIsSequential() throws Exception {
+
+        Exchange ex = _persistit.getExchange("persistit", "WarmupTest", true);
+        BufferPool pool = ex.getBufferPool();
+
+        final int full = pool.getBufferCount() * (pool.getBufferSize() / RED_FOX.length());
+        /*
+         * Overflow the buffer pool
+         */
+        for (int i = 1; i <= full * 3; i++) {
+            ex.getValue().put(RED_FOX);
+            ex.clear().append(i).store();
+        }
+        /*
+         * Pull some low-address pages in to scramble the pool
+         */
+        for (int i = full * 2; i >= 0; i -= 1000) {
+            ex.clear().append(i).fetch();
+        }
+        /*
+         * Verify that buffers in pool now have somewhat scrambled page
+         * addresses
+         */
+        int breaks = 0;
+        long previous = -1;
+
+        for (int i = 0; i < pool.getBufferCount(); i++) {
+            final Buffer b = pool.getBufferCopy(i);
+            assertTrue("Every buffer should be valid at this point", b.isValid());
+            if (b.getPageAddress() < previous) {
+                breaks++;
+            }
+            previous = b.getPageAddress();
+        }
+
+        assertTrue("Buffer pool should have scrambled page address", breaks > 0);
+
+        final Configuration config = _persistit.getConfiguration();
+        ex = null;
+        pool = null;
+        _persistit.close();
+
+        _persistit = new Persistit();
+        config.setBufferPreloadEnabled(false);
+        _persistit.initialize(config);
+
+        final Volume volume = _persistit.getVolume("persistit");
+        final MediatedFileChannel mfc = (MediatedFileChannel) volume.getStorage().getChannel();
+        final TrackingFileChannel tfc = new TrackingFileChannel();
+        mfc.injectChannelForTests(tfc);
+        pool = volume.getStructure().getPool();
+        pool.preloadBufferInventory();
+        assertTrue("Preload should have loaded pages from journal file", tfc.getReadPositionList().size() > 0);
+        tfc.assertSequential(true, true);
     }
 }

=== added file 'src/test/java/com/persistit/stress/PreloadMixtureTxn1.java'
--- src/test/java/com/persistit/stress/PreloadMixtureTxn1.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/persistit/stress/PreloadMixtureTxn1.java	2012-08-24 14:04:53 +0000
@@ -0,0 +1,82 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights reserved.
+ * 
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact [e-mail].
+ * 
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.persistit.stress;
+
+import com.persistit.Configuration;
+import com.persistit.Persistit;
+import com.persistit.Transaction.CommitPolicy;
+import com.persistit.stress.unit.Stress1;
+import com.persistit.stress.unit.Stress2txn;
+import com.persistit.stress.unit.Stress3;
+import com.persistit.stress.unit.Stress3txn;
+import com.persistit.stress.unit.Stress5;
+import com.persistit.stress.unit.Stress6;
+import com.persistit.stress.unit.Stress8txn;
+
+public class PreloadMixtureTxn1 extends AbstractSuite {
+    private final static int CYCLES = 4;
+
+    static String name() {
+        return PreloadMixtureTxn1.class.getSimpleName();
+    }
+
+    public static void main(final String[] args) throws Exception {
+        new PreloadMixtureTxn1(args).runTest();
+    }
+
+    public PreloadMixtureTxn1(final String[] args) {
+        super(name(), args);
+        setDuration(getDuration() / CYCLES);
+    }
+
+    @Override
+    public void runTest() throws Exception {
+
+        deleteFiles(substitute("$datapath$/persistit*"));
+
+        for (int iteration = 0; iteration < CYCLES; iteration++) {
+            clear();
+            add(new Stress1("repeat=10 count=25000"));
+            add(new Stress1("repeat=10 count=25000"));
+            add(new Stress2txn("repeat=10 count=2500 size=4000 seed=118"));
+            add(new Stress2txn("repeat=2 count=25000 seed=119"));
+            add(new Stress3("repeat=5 count=25000 seed=119"));
+            add(new Stress3txn("repeat=5 count=25000 seed=120"));
+            add(new Stress3txn("repeat=5 count=25000"));
+            add(new Stress5("repeat=5 count=25000"));
+            add(new Stress6("repeat=5 count=1000 size=250"));
+            add(new Stress6("repeat=10 count=1000 size=250"));
+            add(new Stress8txn("repeat=2 count=1000 size=1000 seed=1"));
+            add(new Stress8txn("repeat=2 count=1000 size=1000 seed=2"));
+            add(new Stress8txn("repeat=2 count=1000 size=1000 seed=3"));
+            add(new Stress8txn("repeat=2 count=1000 size=1000 seed=4"));
+
+            final Configuration configuration = makeConfiguration(16384, "25000", CommitPolicy.SOFT);
+            configuration.setLogFile(configuration.getLogFile() + "_" + iteration);
+            configuration.setBufferInventoryEnabled(true);
+            configuration.setBufferPreloadEnabled(true);
+
+            final Persistit persistit = new Persistit();
+            persistit.initialize(configuration);
+
+            try {
+                execute(persistit);
+            } finally {
+                persistit.close();
+            }
+        }
+    }
+}

=== modified file 'src/test/java/com/persistit/stress/unit/CommitBench.java'
--- src/test/java/com/persistit/stress/unit/CommitBench.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/stress/unit/CommitBench.java	2012-08-24 14:04:53 +0000
@@ -15,15 +15,19 @@
 
 package com.persistit.stress.unit;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Transaction;
 import com.persistit.Transaction.CommitPolicy;
 import com.persistit.exception.RollbackException;
-import com.persistit.unit.PersistitUnitTestCase;
 import com.persistit.unit.UnitTestProperties;
 import com.persistit.util.ArgParser;
 
@@ -38,6 +42,9 @@
  * 
  */
 public class CommitBench extends PersistitUnitTestCase {
+
+    final static Pattern PATH_PATTERN = Pattern.compile("(.+)\\.(\\d{12})");
+
     /*
      * Want about 1000 pages worth of data (no evictions). Each record is about
      * 50 bytes, so 1000 * 16384 * 60% / 50 ~= 200000.
@@ -47,19 +54,56 @@
     private final int RECORDS_PER_TXN = 10;
     private final String[] ARG_TEMPLATE = new String[] { "threads|int:1:1:1000|Number of threads",
             "duration|int:10:10:86400|Duration of test in seconds",
-            "policy|String:HARD|Commit policy: SOFT, HARD or GROUP", };
+            "policy|String:HARD|Commit policy: SOFT, HARD or GROUP", "datapath|String|Datapath property",
+            "_flag|P|Reuse journal file" };
 
     volatile long stopTime;
+    final ArgParser ap;
     AtomicInteger commitCount = new AtomicInteger();
     AtomicInteger rollbackCount = new AtomicInteger();
 
+    CommitBench(final String[] args) {
+        ap = new ArgParser("CommitBench", args, ARG_TEMPLATE).strict();
+    }
+
     @Override
     protected Properties getProperties(final boolean cleanup) {
-        return UnitTestProperties.getBiggerProperties(cleanup);
+        final Properties p = UnitTestProperties.getBiggerProperties(false);
+        if (ap.isSpecified("datapath")) {
+            p.setProperty("datapath", ap.getStringValue("datapath"));
+        }
+        /*
+         * Custom data directory cleanup - leaving the journal file behind if
+         */
+        final String path = p.getProperty("datapath");
+        final File dir = new File(path);
+        assert dir.isDirectory() : "Data path does not specify a directory: " + path;
+        final File[] files = dir.listFiles();
+        for (final File file : files) {
+            if (ap.isFlag('P') && PATH_PATTERN.matcher(file.getName()).matches()) {
+                try {
+                    /*
+                     * Damage the file so that there's no keystone checkpoint
+                     */
+                    RandomAccessFile raf = new RandomAccessFile(file, "rws");
+                    raf.seek(0);
+                    raf.write(new byte[256]);
+                    raf.close();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                if (file.isDirectory()) {
+                    UnitTestProperties.cleanUpDirectory(file);
+                } else {
+                    file.delete();
+                }
+            }
+        }
+        return p;
     }
 
-    public void bench(final String[] args) throws Exception {
-        final ArgParser ap = new ArgParser("CommitBench", args, ARG_TEMPLATE).strict();
+    public void bench() throws Exception {
         final int threadCount = ap.getIntValue("threads");
         final int duration = ap.getIntValue("duration");
         final String policy = ap.getStringValue("policy");
@@ -138,10 +182,10 @@
     }
 
     public static void main(final String[] args) throws Exception {
-        final CommitBench bench = new CommitBench();
+        final CommitBench bench = new CommitBench(args);
         try {
             bench.setUp();
-            bench.bench(args);
+            bench.bench();
         } finally {
             bench.tearDown();
         }

=== modified file 'src/test/java/com/persistit/stress/unit/TestSamePageOptimization.java'
--- src/test/java/com/persistit/stress/unit/TestSamePageOptimization.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/stress/unit/TestSamePageOptimization.java	2012-08-24 14:04:53 +0000
@@ -19,8 +19,8 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
-import com.persistit.unit.PersistitUnitTestCase;
 
 public class TestSamePageOptimization extends PersistitUnitTestCase {
     final int KEYS = 1000000;

=== modified file 'src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java'
--- src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/BufferPoolMemConfigurationTest.java	2012-08-24 14:04:53 +0000
@@ -24,6 +24,7 @@
 import org.junit.Test;
 
 import com.persistit.Management.BufferPoolInfo;
+import com.persistit.PersistitUnitTestCase;
 
 public class BufferPoolMemConfigurationTest extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/unit/DefaultCoderManagerTest.java'
--- src/test/java/com/persistit/unit/DefaultCoderManagerTest.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/DefaultCoderManagerTest.java	2012-08-24 14:04:53 +0000
@@ -25,6 +25,7 @@
 import org.junit.Test;
 
 import com.persistit.DefaultCoderManager;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 
 public class DefaultCoderManagerTest extends PersistitUnitTestCase implements Serializable {

=== modified file 'src/test/java/com/persistit/unit/ExchangeTest.java'
--- src/test/java/com/persistit/unit/ExchangeTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ExchangeTest.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 import com.persistit.Exchange;
 import com.persistit.Key;
 import com.persistit.KeyFilter;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Transaction;
 import com.persistit.Volume;
 import com.persistit.exception.ConversionException;

=== modified file 'src/test/java/com/persistit/unit/FileLockTest.java'
--- src/test/java/com/persistit/unit/FileLockTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/FileLockTest.java	2012-08-24 14:04:53 +0000
@@ -22,6 +22,7 @@
 import org.junit.Test;
 
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 
 /**

=== modified file 'src/test/java/com/persistit/unit/JoinTest1.java'
--- src/test/java/com/persistit/unit/JoinTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/JoinTest1.java	2012-08-24 14:04:53 +0000
@@ -21,6 +21,7 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.exception.PersistitException;
 

=== modified file 'src/test/java/com/persistit/unit/KeyCoderTest1.java'
--- src/test/java/com/persistit/unit/KeyCoderTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/KeyCoderTest1.java	2012-08-24 14:04:53 +0000
@@ -27,6 +27,7 @@
 import org.junit.Test;
 
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.TestShim;
 import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.KeyCoder;

=== modified file 'src/test/java/com/persistit/unit/KeyFilterTest1.java'
--- src/test/java/com/persistit/unit/KeyFilterTest1.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/KeyFilterTest1.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 import com.persistit.KeyFilter;
 import com.persistit.KeyState;
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 
 /**

=== modified file 'src/test/java/com/persistit/unit/KeyFilterTest2.java'
--- src/test/java/com/persistit/unit/KeyFilterTest2.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/KeyFilterTest2.java	2012-08-24 14:04:53 +0000
@@ -23,6 +23,7 @@
 import com.persistit.Exchange;
 import com.persistit.Key;
 import com.persistit.KeyFilter;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 
 /**

=== modified file 'src/test/java/com/persistit/unit/KeyParserTest1.java'
--- src/test/java/com/persistit/unit/KeyParserTest1.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/KeyParserTest1.java	2012-08-24 14:04:53 +0000
@@ -23,6 +23,7 @@
 import com.persistit.Key;
 import com.persistit.KeyParser;
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 
 /**
  * @version 1.0

=== modified file 'src/test/java/com/persistit/unit/KeyParserTest2.java'
--- src/test/java/com/persistit/unit/KeyParserTest2.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/KeyParserTest2.java	2012-08-24 14:04:53 +0000
@@ -23,6 +23,7 @@
 import com.persistit.Key;
 import com.persistit.KeyFilter;
 import com.persistit.KeyParser;
+import com.persistit.PersistitUnitTestCase;
 
 public class KeyParserTest2 extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/unit/KeyTest1.java'
--- src/test/java/com/persistit/unit/KeyTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/KeyTest1.java	2012-08-24 14:04:53 +0000
@@ -30,6 +30,7 @@
 import com.persistit.Buffer;
 import com.persistit.Key;
 import com.persistit.KeyState;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.TestShim;
 import com.persistit.exception.InvalidKeyException;
 import com.persistit.exception.MissingKeySegmentException;

=== modified file 'src/test/java/com/persistit/unit/Log4JLoggerTest.java'
--- src/test/java/com/persistit/unit/Log4JLoggerTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/Log4JLoggerTest.java	2012-08-24 14:04:53 +0000
@@ -20,6 +20,7 @@
 import org.junit.Test;
 
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 import com.persistit.logging.Log4JAdapter;
 

=== modified file 'src/test/java/com/persistit/unit/LongRecordTest1.java'
--- src/test/java/com/persistit/unit/LongRecordTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/LongRecordTest1.java	2012-08-24 14:04:53 +0000
@@ -22,6 +22,7 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 import com.persistit.util.Debug;
 import com.persistit.util.Util;

=== modified file 'src/test/java/com/persistit/unit/LotsaSmallKeys.java'
--- src/test/java/com/persistit/unit/LotsaSmallKeys.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/LotsaSmallKeys.java	2012-08-24 14:04:53 +0000
@@ -20,6 +20,7 @@
 import org.junit.Test;
 
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 import com.persistit.policy.SplitPolicy;
 

=== modified file 'src/test/java/com/persistit/unit/PersistitMapTest.java'
--- src/test/java/com/persistit/unit/PersistitMapTest.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/PersistitMapTest.java	2012-08-24 14:04:53 +0000
@@ -34,6 +34,7 @@
 import com.persistit.Exchange;
 import com.persistit.KeyFilter;
 import com.persistit.PersistitMap;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 import com.persistit.util.Util;
 

=== removed file 'src/test/java/com/persistit/unit/PersistitUnitTestCase.java'
--- src/test/java/com/persistit/unit/PersistitUnitTestCase.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/PersistitUnitTestCase.java	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/**
- * Copyright © 2011-2012 Akiban Technologies, Inc.  All rights reserved.
- * 
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * This program may also be available under different license terms.
- * For more information, see www.akiban.com or contact [e-mail].
- * 
- * Contributors:
- * Akiban Technologies, Inc.
- */
-
-package com.persistit.unit;
-
-import java.lang.ref.WeakReference;
-import java.util.Map;
-import java.util.Properties;
-
-import org.junit.After;
-import org.junit.Before;
-
-import com.persistit.Persistit;
-import com.persistit.exception.PersistitException;
-
-public abstract class PersistitUnitTestCase {
-
-    private final static long TEN_SECONDS = 10L * 1000L * 1000L * 1000L;
-
-    protected final static String RED_FOX = "The quick red fox jumped over the lazy brown dog.";
-
-    protected static String createString(final int exactLength) {
-        final StringBuilder sb = new StringBuilder(exactLength);
-        // Simple 0..9a..z string
-        for (int i = 0; i < 36; ++i) {
-            sb.append(Character.forDigit(i, 36));
-        }
-        final String numAndLetters = sb.toString();
-        while (sb.length() < exactLength) {
-            sb.append(numAndLetters);
-        }
-        return sb.toString().substring(0, exactLength);
-    }
-
-    protected Persistit _persistit = new Persistit();
-
-    protected Properties getProperties(final boolean cleanup) {
-        return UnitTestProperties.getProperties(cleanup);
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        checkNoPersistitThreads();
-
-        _persistit.initialize(getProperties(true));
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        final WeakReference<Persistit> ref = new WeakReference<Persistit>(_persistit);
-        _persistit.close(false);
-        _persistit = null;
-
-        if (!doesRefBecomeNull(ref)) {
-            System.out.println("Persistit has a leftover strong reference");
-        }
-        checkNoPersistitThreads();
-    }
-
-    public void runAllTests() throws Exception {
-
-    }
-
-    public void setPersistit(final Persistit persistit) {
-        _persistit = persistit;
-    }
-
-    protected void initAndRunTest() throws Exception {
-        setUp();
-        try {
-            runAllTests();
-        } catch (final Throwable t) {
-            t.printStackTrace();
-        } finally {
-            tearDown();
-        }
-    }
-
-    private final static String[] PERSISTIT_THREAD_NAMES = { "CHECKPOINT_WRITER", "JOURNAL_COPIER", "JOURNAL_FLUSHER",
-            "PAGE_WRITER", "TXN_UPDATE" };
-
-    protected boolean checkNoPersistitThreads() {
-        boolean alive = false;
-        final Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
-        for (final Thread t : map.keySet()) {
-            final String name = t.getName();
-            for (final String p : PERSISTIT_THREAD_NAMES) {
-                if (name.contains(p)) {
-                    alive = true;
-                    System.err.println("Thread " + t + " is still alive");
-                }
-            }
-        }
-        return alive;
-    }
-
-    protected void safeCrashAndRestoreProperties() throws PersistitException {
-        final Properties properties = _persistit.getProperties();
-        _persistit.flush();
-        _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
-    }
-
-    protected void crashWithoutFlushAndRestoreProperties() throws PersistitException {
-        final Properties properties = _persistit.getProperties();
-        _persistit.crash();
-        _persistit = new Persistit();
-        _persistit.initialize(properties);
-    }
-
-    public static boolean doesRefBecomeNull(final WeakReference<?> ref) throws InterruptedException {
-        final long expires = System.nanoTime() + TEN_SECONDS;
-        while (ref.get() != null && System.nanoTime() < expires) {
-            System.gc();
-            Thread.sleep(10);
-        }
-        return ref.get() == null;
-    }
-}

=== modified file 'src/test/java/com/persistit/unit/SaveLoadTest1.java'
--- src/test/java/com/persistit/unit/SaveLoadTest1.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/SaveLoadTest1.java	2012-08-24 14:04:53 +0000
@@ -24,6 +24,7 @@
 import org.junit.Test;
 
 import com.persistit.PersistitMap;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.StreamLoader;
 import com.persistit.StreamSaver;
 import com.persistit.exception.PersistitException;

=== modified file 'src/test/java/com/persistit/unit/SimpleTest1.java'
--- src/test/java/com/persistit/unit/SimpleTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/SimpleTest1.java	2012-08-24 14:04:53 +0000
@@ -25,6 +25,7 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.exception.PersistitException;
 

=== modified file 'src/test/java/com/persistit/unit/TemporaryVolumeTest1.java'
--- src/test/java/com/persistit/unit/TemporaryVolumeTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/TemporaryVolumeTest1.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 import com.persistit.Exchange;
 import com.persistit.Key;
 import com.persistit.Management;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.Volume;
 import com.persistit.exception.PersistitException;

=== modified file 'src/test/java/com/persistit/unit/TransactionTest1.java'
--- src/test/java/com/persistit/unit/TransactionTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/TransactionTest1.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 import com.persistit.Exchange;
 import com.persistit.Key;
 import com.persistit.KeyFilter;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Transaction;
 import com.persistit.Value;
 import com.persistit.exception.PersistitException;

=== modified file 'src/test/java/com/persistit/unit/TransactionTest3.java'
--- src/test/java/com/persistit/unit/TransactionTest3.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/TransactionTest3.java	2012-08-24 14:04:53 +0000
@@ -27,6 +27,7 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Transaction;
 import com.persistit.exception.PersistitException;
 

=== modified file 'src/test/java/com/persistit/unit/TreeTest1.java'
--- src/test/java/com/persistit/unit/TreeTest1.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/TreeTest1.java	2012-08-24 14:04:53 +0000
@@ -23,6 +23,7 @@
 
 import com.persistit.Exchange;
 import com.persistit.Key;
+import com.persistit.PersistitUnitTestCase;
 
 public class TreeTest1 extends PersistitUnitTestCase {
 

=== modified file 'src/test/java/com/persistit/unit/UnitTestProperties.java'
--- src/test/java/com/persistit/unit/UnitTestProperties.java	2012-08-07 21:11:28 +0000
+++ src/test/java/com/persistit/unit/UnitTestProperties.java	2012-08-24 14:04:53 +0000
@@ -43,7 +43,6 @@
         p.setProperty("tmpvoldir", "${datapath}");
         p.setProperty("rmiport", System.getProperty("rmiport", "8081"));
         p.setProperty("jmx", "true");
-        p.setProperty("bufferinventory", "/tmp/persistit_test_data");
         return p;
     }
 

=== modified file 'src/test/java/com/persistit/unit/ValueCoderTest1.java'
--- src/test/java/com/persistit/unit/ValueCoderTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueCoderTest1.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 import org.junit.Test;
 
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.ValueCoder;

=== modified file 'src/test/java/com/persistit/unit/ValueCoderTest2.java'
--- src/test/java/com/persistit/unit/ValueCoderTest2.java	2012-08-02 04:45:28 +0000
+++ src/test/java/com/persistit/unit/ValueCoderTest2.java	2012-08-24 14:04:53 +0000
@@ -25,6 +25,7 @@
 
 import com.persistit.DefaultObjectCoder;
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.exception.PersistitException;
 
 public class ValueCoderTest2 extends PersistitUnitTestCase {

=== modified file 'src/test/java/com/persistit/unit/ValueTest1.java'
--- src/test/java/com/persistit/unit/ValueTest1.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueTest1.java	2012-08-24 14:04:53 +0000
@@ -28,6 +28,7 @@
 
 import org.junit.Test;
 
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.util.Util;
 

=== modified file 'src/test/java/com/persistit/unit/ValueTest2.java'
--- src/test/java/com/persistit/unit/ValueTest2.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueTest2.java	2012-08-24 14:04:53 +0000
@@ -30,6 +30,7 @@
 import org.junit.Test;
 
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.encoding.CollectionValueCoder;
 import com.persistit.exception.PersistitException;

=== modified file 'src/test/java/com/persistit/unit/ValueTest3.java'
--- src/test/java/com/persistit/unit/ValueTest3.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueTest3.java	2012-08-24 14:04:53 +0000
@@ -34,6 +34,7 @@
 import com.persistit.DefaultValueCoder;
 import com.persistit.Exchange;
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.CoderManager;

=== modified file 'src/test/java/com/persistit/unit/ValueTest4.java'
--- src/test/java/com/persistit/unit/ValueTest4.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueTest4.java	2012-08-24 14:04:53 +0000
@@ -35,6 +35,7 @@
 import com.persistit.DefaultValueCoder;
 import com.persistit.Exchange;
 import com.persistit.Persistit;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.Value;
 import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.CoderManager;

=== modified file 'src/test/java/com/persistit/unit/ValueTest5.java'
--- src/test/java/com/persistit/unit/ValueTest5.java	2012-08-24 14:04:53 +0000
+++ src/test/java/com/persistit/unit/ValueTest5.java	2012-08-24 14:04:53 +0000
@@ -22,6 +22,7 @@
 import org.junit.Test;
 
 import com.persistit.Exchange;
+import com.persistit.PersistitUnitTestCase;
 import com.persistit.encoding.CoderManager;
 import com.persistit.exception.PersistitException;