Merge lp:~pbeaman/akiban-persistit/fix-dynamic-volumes into lp:akiban-persistit

[Peter Beaman]

Corrects a problem in the original JournalManager file format so that dynamically-created volumes are correctly recorded and handled. This change has implications for Akiban Server described below.

The fundamental change is that in the IV (identify volume) record of the Journal, previous versions store only the name of the volume, not the full VolumeSpecification. This works fine when the volumes are fully specified in the Configuration, but does not work at all for volumes created using Persistit#loadVolume(VolumeSpecification). In fact, when such a volume is created the result is an irrecoverable journal recovery failure.

The root cause is a design error in the Journal in which the IV record contains insufficient information to handle all volumes.

The proposed solution is for the IV record to contain the string representation of the VolumeSpecification rather than just the volume name. With the full specification the JournalManager and RecoveryManager can find and open volumes that are not specified in the Configuration.

As part of this proposal, the handling of volumes in JM and RM is cleaned up. In particular, it is no longer the case that the Volume object in a PageNode or on the _handleToVolumeMap in JM is a different object than the Volume actually opened for reading and writing. Instead, there is exactly one Volume object per volume name, and that Volume may be either hollow or open depending on its use. To accomplish this the Persitit#initalizeVolumes() method now finds Volume instances already loaded by the recovery process and uses those instances having names matching the Configuration.

The semantics are a bit complicated:

- (a) a Volume specified statically in the Configuration is matched only by name against a volume specification that has been loaded from the Journal during recovery. This affords the administrator the opportunity to move a volume to a different file system, for example, by moving it and changing the Persistit configuration. However, there is a verification to ensure the volume ID values match, and an Exception is thrown if an attempt to load a different version of a volume having the same name occurs.

- (b) a Volume specified dynamically must exist in the same path and with the same volume ID as specified in the journal. If the volume file itself has been removed since the IV record was written, Persistit receives a VolumeNotFoundException and notes it as a "missing volume" in the AlertMonitor and/or stops depending on the state of the ignoreMissingVolumes configuration property.

The code in this proposal is forward-compatible, meaning that a journal file written before these changes is readable with them. This is because specifying only a name as a VolumeSpecification results in an incomplete VolumeSpecification that is nonetheless capable of being matched against a statically declared volume. Therefore the logic described in (a) is sufficient to match the volume named in the IV record against the volumes defined in the configuration. Therefore no change to existing databases is required handle the upgrade.

On the other hand, by default, the new IV record format written by this proposal is incompatible with older versions of Persistit. This would prevent a customer from upgrading, then downgrading to a previous release. Since we want a period of safe downgrade support in the field, this proposal adds a boolean configuration property "useOldVSpec" that causes IV records to be written in the old format. With this property enabled, journal written by this version are backward-compatible with previous versions of Persistit. The useOldVSpec methods are marked @Deprecated since our plan is to remove this property as soon as all field installations are stable on a release containing the new code.

A couple of new unit tests, one derived from sample code provided in https://bugs.launchpad.net/akiban-persistit/+bug/1045971, have been added. In addition, I have run the entire unit test suite successfully with with useOldVSpec enabled. Of course, the specific test for 1045971 fails as expected in this mode.

A parallel proposal to enable the useOldVSpec parameter is being proposed for Akiban Server.

[Nathan Williams (nwilliams)]

Since this is one way compatible, would a version bump be useful, e.g. 3.2.0? Would make the server side simple to synch as well.

There doesn't appear to be any direct test for to/from string for VolumeSpecification. Since this is directly in the journal and affects database compatibility, should we a be a bit more stringent about that? The edge cases and properties not usually given would be my main concern.

Did Tim have any conclusion from his comment about the useOldVSPec parameter?

Otherwise, everything looks plausible.

review: Needs Information

[Peter Beaman (pbeaman)]

Good ideas.

Version bumped to 3.2.0.

Modified VolumeSpecification to strengthen validity constraints initial/extension/maximum/Size/Pages, and new tests in VolumeTest.

[Nathan Williams (nwilliams)]

Thanks for the tweaks. Looks good to me.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

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

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

review: Needs Fixing

[Peter Beaman (pbeaman)]

This appears to have been caused by a problem with artifactory. I zapped and refreshed the plugins cache and will now re-Approve to see whether the build works again.

=== modified file 'pom.xml'
--- pom.xml	2012-09-11 14:06:09 +0000
+++ pom.xml	2012-10-06 02:46:19 +0000
@@ -4,7 +4,7 @@
 
     <groupId>com.akiban</groupId>
     <artifactId>akiban-persistit</artifactId>
-    <version>3.1.8-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>

=== modified file 'src/main/java/com/persistit/Buffer.java'
--- src/main/java/com/persistit/Buffer.java	2012-09-28 22:17:31 +0000
+++ src/main/java/com/persistit/Buffer.java	2012-10-06 02:46:19 +0000
@@ -4268,7 +4268,7 @@
             IV.putHandle(bb, volumeHandle);
             IV.putVolumeId(bb, volume.getId());
             IV.putTimestamp(bb, 0);
-            IV.putVolumeName(bb, volume.getName());
+            IV.putVolumeSpecification(bb, volume.getName());
             bb.position(bb.position() + IV.getLength(bb));
             identifiedVolumes.add(volume);
         }

=== modified file 'src/main/java/com/persistit/Configuration.java'
--- src/main/java/com/persistit/Configuration.java	2012-08-24 14:00:17 +0000
+++ src/main/java/com/persistit/Configuration.java	2012-10-06 02:46:19 +0000
@@ -271,6 +271,11 @@
     public final static String IGNORE_MISSING_VOLUMES_PROPERTY = "ignoremissingvolumes";
 
     /**
+     * Property name to enable writing backward-compatible IV records
+     */
+    public final static String USE_OLD_VSPEC = "useoldvspec";
+
+    /**
      * Property name to specify the default {@link SplitPolicy}.
      */
     public final static String SPLIT_POLICY_PROPERTY_NAME = "splitpolicy";
@@ -643,6 +648,7 @@
     private String tmpVolDir;
     private int tmpVolPageSize;
     private long tmpVolMaxSize;
+    private boolean useOldVSpec;
 
     /**
      * Construct a <code>Configuration</code> instance. This object may be
@@ -739,6 +745,7 @@
         setSysVolume(getProperty(SYSTEM_VOLUME_PROPERTY_NAME, DEFAULT_SYSTEM_VOLUME_NAME));
         setBufferInventoryEnabled(getBooleanProperty(BUFFER_INVENTORY_PROPERTY_NAME, false));
         setBufferPreloadEnabled(getBooleanProperty(BUFFER_PRELOAD_PROPERTY_NAME, false));
+        setUseOldVSpec(getBooleanProperty(USE_OLD_VSPEC, false));
 
         loadPropertiesBufferSpecifications();
         loadPropertiesVolumeSpecifications();
@@ -1877,7 +1884,8 @@
     /**
      * Return the value defined by {@link #setIgnoreMissingVolumes(boolean)}
      * 
-     * @return <code>true</code>to enable ignore-missing-volumes mode
+     * @return <code>true</code> indicates that <i>ignore-missing-volumes</i>
+     *         mode is enabled
      */
     public boolean isIgnoreMissingVolumes() {
         return ignoreMissingVolumes;
@@ -1903,4 +1911,47 @@
     public void setIgnoreMissingVolumes(final boolean ignoreMissingVolumes) {
         this.ignoreMissingVolumes = ignoreMissingVolumes;
     }
+
+    /**
+     * Return the value defined by {@link #setUseOldVSpec(boolean)}
+     * 
+     * @return <code>true</code> indicates that <i>use-old-vspec</i> mode is
+     *         enabled
+     */
+    @Deprecated
+    public boolean isUseOldVSpec() {
+        return useOldVSpec;
+    }
+
+    /**
+     * <p>
+     * Control whether Persistit writes old-format volume identifiers into the
+     * Journal. By default as of version 3.1.8, Persistit writes a complete
+     * {@link VolumeSpecification} into the journal IV (Identify Volume) record
+     * rather than just a volume name. This is preferable in almost all cases.
+     * However, journals written in this new format cannot be read by earlier
+     * versions of Persistit. To retain the ability to drop back to an earlier
+     * version of Persistit, enabling <i>use-old-vspec</i> mode causes Persistit
+     * to write only the volume name rather than the entire VolumeSpecification.
+     * Journal files created by version 3.1.8 with this mode enabled can be used
+     * by earlier versions of Persistit. However, doing so prevents volumes
+     * created dynamically using
+     * {@link Persistit#loadVolume(VolumeSpecification))} from being recovered
+     * properly. (See https://bugs.launchpad.net/akiban-persistit/+bug/1045971)
+     * </p>
+     * <p>
+     * This method and configuration parameter is deprecated and will be removed
+     * after existing sites have been upgraded and are likely not to revert to
+     * any version of Persistit earlier than 3.1.8
+     * </p>
+     * 
+     * @param useOldVSpec
+     *            <code>true</code> to write only the volume name into the
+     *            journal.
+     */
+    @Deprecated
+    public void setUseOldVSpec(final boolean useOldVSpec) {
+        this.useOldVSpec = useOldVSpec;
+    }
+
 }

=== modified file 'src/main/java/com/persistit/Exchange.java'
--- src/main/java/com/persistit/Exchange.java	2012-10-02 20:37:24 +0000
+++ src/main/java/com/persistit/Exchange.java	2012-10-06 02:46:19 +0000
@@ -1492,7 +1492,7 @@
                         if (doMVCC) {
                             valueToStore = spareValue;
                             final int valueSize = value.getEncodedSize();
-                            int retries = VERSIONS_OUT_OF_ORDER_RETRY_COUNT;
+                            final int retries = VERSIONS_OUT_OF_ORDER_RETRY_COUNT;
 
                             for (;;) {
                                 try {

=== modified file 'src/main/java/com/persistit/JournalManager.java'
--- src/main/java/com/persistit/JournalManager.java	2012-09-27 22:17:34 +0000
+++ src/main/java/com/persistit/JournalManager.java	2012-10-06 02:46:19 +0000
@@ -60,6 +60,7 @@
 import com.persistit.exception.PersistitIOException;
 import com.persistit.exception.PersistitInterruptedException;
 import com.persistit.exception.RebalanceException;
+import com.persistit.exception.VolumeNotFoundException;
 import com.persistit.mxbeans.JournalManagerMXBean;
 import com.persistit.util.Debug;
 import com.persistit.util.Util;
@@ -289,7 +290,6 @@
             _journalCreatedTime = System.currentTimeMillis();
         }
         _closed.set(false);
-
     }
 
     public void startJournal() throws PersistitException {
@@ -661,7 +661,19 @@
         if (volume == null) {
             return null;
         }
-        return _persistit.getVolume(volume.getName());
+        if (!volume.isOpened()) {
+            volume.open(_persistit);
+        }
+        return volume;
+    }
+
+    synchronized Volume getVolumeByName(final String volumeName) {
+        for (final Volume v : _handleToVolumeMap.values()) {
+            if (volumeName.equals(v.getName())) {
+                return v;
+            }
+        }
+        return null;
     }
 
     @Override
@@ -1124,7 +1136,11 @@
         IV.putHandle(_writeBuffer, handle);
         IV.putVolumeId(_writeBuffer, volume.getId());
         JournalRecord.putTimestamp(_writeBuffer, epochalTimestamp());
-        IV.putVolumeName(_writeBuffer, volume.getName());
+        if (_persistit.getConfiguration().isUseOldVSpec()) {
+            IV.putVolumeSpecification(_writeBuffer, volume.getName());
+        } else {
+            IV.putVolumeSpecification(_writeBuffer, volume.getSpecification().toString());
+        }
         final int recordSize = JournalRecord.getLength(_writeBuffer);
         _persistit.getIOMeter().chargeWriteOtherToJournal(recordSize, _currentAddress);
         advance(recordSize);
@@ -2440,8 +2456,6 @@
         int handle = -1;
 
         for (final Iterator<PageNode> iterator = list.iterator(); iterator.hasNext();) {
-            Volume volumeRef = null;
-
             if (_closed.get() && !_copyFast.get() || _appendOnly.get()) {
                 list.clear();
                 break;
@@ -2451,15 +2465,15 @@
                 iterator.remove();
                 continue;
             }
+            pageNode.setOffset(-1);
             if (pageNode.getVolumeHandle() != handle) {
                 handle = -1;
-                volume = null;
-                // Possibly hollow volume
-                volumeRef = _handleToVolumeMap.get(pageNode.getVolumeHandle());
-                if (volumeRef != null) {
-                    // Opened volume, if present
-                    volume = _persistit.getVolume(volumeRef.getName());
-                    handle = pageNode.getVolumeHandle();
+                try {
+                    volume = volumeForHandle(pageNode.getVolumeHandle());
+                    handle = volume.getHandle();
+                } catch (final VolumeNotFoundException vnfe) {
+                    // Deal with this in writeForCopy
+                    continue;
                 }
             }
             if (volume == null) {
@@ -2476,7 +2490,7 @@
                     continue;
                 }
                 pageAddress = readPageBufferFromJournal(stablePageNode, bb);
-                _persistit.getIOMeter().chargeCopyPageFromJournal(volumeRef, pageAddress, volume.getPageSize(),
+                _persistit.getIOMeter().chargeCopyPageFromJournal(volume, pageAddress, volume.getPageSize(),
                         stablePageNode.getJournalAddress(), urgency());
             } catch (final PersistitException ioe) {
                 _persistit
@@ -2501,7 +2515,6 @@
 
     void writeForCopy(final List<PageNode> list, final ByteBuffer bb) throws PersistitException {
         Collections.sort(list, PageNode.WRITE_COMPARATOR);
-        Volume volumeRef = null;
         Volume volume = null;
         int handle = -1;
         final Set<Volume> volumes = new HashSet<Volume>();
@@ -2517,25 +2530,28 @@
             if (pageNode.getVolumeHandle() != handle) {
                 handle = -1;
                 volume = null;
-                // Possibly hollow volume
-                volumeRef = _handleToVolumeMap.get(pageNode.getVolumeHandle());
-                if (volumeRef != null) {
-                    // Opened volume, if present
-                    volume = _persistit.getVolume(volumeRef.getName());
-                    handle = pageNode.getVolumeHandle();
-                }
-            }
-            if (volume == null) {
-                _persistit.getAlertMonitor().post(
-                        new Event(AlertLevel.WARN, _persistit.getLogBase().missingVolume, volumeRef,
-                                pageNode.getJournalAddress()), AlertMonitor.MISSING_VOLUME_CATEGORY);
-                if (_ignoreMissingVolume.get()) {
-                    _persistit.getLogBase().lostPageFromMissingVolume.log(pageNode.getPageAddress(), volumeRef,
-                            pageNode.getJournalAddress());
-                    // Not removing the page from the List here will cause
-                    // cleanupForCopy to remove it from
-                    // the page map.
-                    continue;
+                Volume candidate = null;
+                try {
+                    candidate = lookupVolumeHandle(pageNode.getVolumeHandle());
+                    if (candidate != null) {
+                        if (!candidate.isOpened()) {
+                            candidate.open(_persistit);
+                        }
+                        handle = pageNode.getVolumeHandle();
+                        volume = candidate;
+                    }
+                } catch (final VolumeNotFoundException vnfe) {
+                    _persistit.getAlertMonitor().post(
+                            new Event(AlertLevel.WARN, _persistit.getLogBase().missingVolume, candidate,
+                                    pageNode.getJournalAddress()), AlertMonitor.MISSING_VOLUME_CATEGORY);
+                    if (_ignoreMissingVolume.get()) {
+                        _persistit.getLogBase().lostPageFromMissingVolume.log(pageNode.getPageAddress(), candidate,
+                                pageNode.getJournalAddress());
+                        // Not removing the page from the List here will cause
+                        // cleanupForCopy to remove it from
+                        // the page map.
+                        continue;
+                    }
                 }
             }
             if (volume == null || volume.isClosed()) {
@@ -2545,8 +2561,6 @@
                 continue;
             }
 
-            volumeRef.verifyId(volume.getId());
-
             final long pageAddress = pageNode.getPageAddress();
             volume.getStorage().extend(pageAddress);
             final int pageSize = volume.getPageSize();
@@ -2624,7 +2638,7 @@
                 // the most recent one that has been checkpointed.
                 //
                 for (PageNode pn = pageNode; pn != null; pn = pn.getPrevious()) {
-                    if (pn.getJournalAddress() < recoveryBoundary) {
+                    if (!pn.isInvalid() && pn.getJournalAddress() < recoveryBoundary) {
                         recoveryBoundary = pn.getJournalAddress();
                     }
                 }
@@ -2725,6 +2739,18 @@
         return size - to;
     }
 
+    synchronized void truncate(final Volume volume, final long timestamp) {
+        for (final PageNode lastPageNode : _pageMap.values()) {
+            PageNode pageNode = lastPageNode;
+            while (pageNode != null) {
+                if (volume.getHandle() == pageNode.getVolumeHandle() && pageNode.getTimestamp() < timestamp) {
+                    pageNode.invalidate();
+                }
+                pageNode = pageNode.getPrevious();
+            }
+        }
+    }
+
     private void reportJournalFileCount() {
         /*
          * Does not need synchronization since only the JOURNAL_COPIER thread
@@ -2776,17 +2802,6 @@
         public Persistit getPersistit() {
             return _persistit;
         }
-
-        @Override
-        public TreeDescriptor handleToTreeDescriptor(final int treeHandle) {
-            return _handleToTreeMap.get(treeHandle);
-        }
-
-        @Override
-        public Volume handleToVolume(final int volumeHandle) {
-            return _handleToVolumeMap.get(volumeHandle);
-        }
-
     }
 
     class ProactiveRollbackListener implements TransactionPlayerListener {

=== modified file 'src/main/java/com/persistit/JournalRecord.java'
--- src/main/java/com/persistit/JournalRecord.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/JournalRecord.java	2012-10-06 02:46:19 +0000
@@ -751,13 +751,13 @@
             putLong(bb, 20, volumeId);
         }
 
-        public static String getVolumeName(final ByteBuffer bb) {
+        public static String getVolumeSpecification(final ByteBuffer bb) {
             final int length = getLength(bb) - OVERHEAD;
             return new String(bb.array(), bb.position() + OVERHEAD, length, UTF8);
         }
 
-        public static void putVolumeName(final ByteBuffer bb, final String volumeName) {
-            final byte[] stringBytes = volumeName.getBytes(UTF8);
+        public static void putVolumeSpecification(final ByteBuffer bb, final String volumeSpec) {
+            final byte[] stringBytes = volumeSpec.getBytes(UTF8);
             System.arraycopy(stringBytes, 0, bb.array(), bb.position() + OVERHEAD, stringBytes.length);
             putLength(bb, OVERHEAD + stringBytes.length);
         }

=== modified file 'src/main/java/com/persistit/JournalTool.java'
--- src/main/java/com/persistit/JournalTool.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/JournalTool.java	2012-10-06 02:46:19 +0000
@@ -732,7 +732,7 @@
             read(address, recordSize);
             final int handle = IV.getHandle(_readBuffer);
             final long id = IV.getVolumeId(_readBuffer);
-            final String name = IV.getVolumeName(_readBuffer);
+            final String name = IV.getVolumeSpecification(_readBuffer);
             start(address, timestamp, "IV", recordSize);
             appendf(" handle %05d id %,22d name %s", handle, id, name);
             flush();

=== modified file 'src/main/java/com/persistit/Persistit.java'
--- src/main/java/com/persistit/Persistit.java	2012-09-12 22:02:22 +0000
+++ src/main/java/com/persistit/Persistit.java	2012-10-06 02:46:19 +0000
@@ -663,8 +663,13 @@
 
     void initializeVolumes() throws PersistitException {
         for (final VolumeSpecification volumeSpecification : _configuration.getVolumeList()) {
+            Volume volume = _journalManager.getVolumeByName(volumeSpecification.getName());
+            if (volume == null) {
+                volume = new Volume(volumeSpecification);
+            } else {
+                volume.overwriteSpecification(volumeSpecification);
+            }
             _logBase.openVolume.log(volumeSpecification.getName(), volumeSpecification.getAbsoluteFile());
-            final Volume volume = new Volume(volumeSpecification);
             volume.open(this);
         }
     }

=== modified file 'src/main/java/com/persistit/RecoveryManager.java'
--- src/main/java/com/persistit/RecoveryManager.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/RecoveryManager.java	2012-10-06 02:46:19 +0000
@@ -360,17 +360,6 @@
         public Persistit getPersistit() {
             return _persistit;
         }
-
-        @Override
-        public TreeDescriptor handleToTreeDescriptor(final int treeHandle) {
-            return _handleToTreeMap.get(treeHandle);
-        }
-
-        @Override
-        public Volume handleToVolume(final int volumeHandle) {
-            return _handleToVolumeMap.get(volumeHandle);
-        }
-
     }
 
     static File[] files(final String pathName) {
@@ -986,14 +975,18 @@
         }
         read(address, recordSize);
         final Integer handle = Integer.valueOf(IV.getHandle(_readBuffer));
-        final String name = IV.getVolumeName(_readBuffer);
-        final long volumeId = IV.getVolumeId(_readBuffer);
-        final Volume volume = new Volume(name, volumeId);
+        final long id = IV.getVolumeId(_readBuffer);
+        final String specification = IV.getVolumeSpecification(_readBuffer);
+        final VolumeSpecification vs = new VolumeSpecification(specification);
+        vs.setCreate(false);
+        vs.setCreateOnly(false);
+        final Volume volume = new Volume(vs);
+        volume.setId(id);
 
         _handleToVolumeMap.put(handle, volume);
         _volumeToHandleMap.put(volume, handle);
 
-        _persistit.getLogBase().recoveryRecord.log("IV", addressToString(address, timestamp), name, timestamp);
+        _persistit.getLogBase().recoveryRecord.log("IV", addressToString(address, timestamp), vs.getName(), timestamp);
     }
 
     /**

=== modified file 'src/main/java/com/persistit/TransactionPlayer.java'
--- src/main/java/com/persistit/TransactionPlayer.java	2012-09-08 20:43:15 +0000
+++ src/main/java/com/persistit/TransactionPlayer.java	2012-10-06 02:46:19 +0000
@@ -36,8 +36,8 @@
 import com.persistit.JournalRecord.SR;
 import com.persistit.JournalRecord.TX;
 import com.persistit.exception.CorruptJournalException;
-import com.persistit.exception.MissingVolumeException;
 import com.persistit.exception.PersistitException;
+import com.persistit.exception.VolumeNotFoundException;
 
 class TransactionPlayer {
 
@@ -245,7 +245,7 @@
                             + addressToString(address));
                 }
                 }
-            } catch (final MissingVolumeException mve) {
+            } catch (final VolumeNotFoundException vnfe) {
                 final Persistit db = _support.getPersistit();
                 if (db.getJournalManager().isIgnoreMissingVolumes()) {
                     /*
@@ -253,13 +253,16 @@
                      * Alert, but allow recovery or rollback to continue.
                      */
                     db.getAlertMonitor().post(
-                            new Event(AlertLevel.WARN, db.getLogBase().missingVolume, mve.getVolumeName(), address
+                            new Event(AlertLevel.WARN, db.getLogBase().missingVolume, vnfe.getMessage(), address
                                     + position - start), AlertMonitor.MISSING_VOLUME_CATEGORY);
                     ignoredUpdates.incrementAndGet();
                 } else {
                     failedUpdates.incrementAndGet();
-                    throw mve;
+                    throw vnfe;
                 }
+            } catch (final PersistitException e) {
+                failedUpdates.incrementAndGet();
+                throw e;
             }
             position += innerSize;
         }
@@ -274,29 +277,16 @@
     }
 
     private Exchange getExchange(final int treeHandle, final long from, final long timestamp) throws PersistitException {
-        final TreeDescriptor td = _support.handleToTreeDescriptor(treeHandle);
+        final TreeDescriptor td = _support.getPersistit().getJournalManager().lookupTreeHandle(treeHandle);
         if (td == null) {
             throw new CorruptJournalException("Tree handle " + treeHandle + " is undefined at "
                     + addressToString(from, timestamp));
         }
-        final Volume volumeRef = _support.handleToVolume(td.getVolumeHandle());
-        Volume volume;
-        if (volumeRef == null) {
+        final Volume volume = _support.getPersistit().getJournalManager().volumeForHandle(td.getVolumeHandle());
+        if (volume == null) {
             throw new CorruptJournalException("Volume handle " + td.getVolumeHandle() + " is undefined at "
                     + addressToString(from, timestamp));
         }
-
-        if (volumeRef.isOpened()) {
-            volume = volumeRef;
-        } else {
-            volume = _support.getPersistit().getVolume(volumeRef.getName());
-            if (volume == null) {
-                throw new MissingVolumeException("No matching Volume found for journal reference " + volumeRef + " at "
-                        + addressToString(from, timestamp), volumeRef.getName());
-            }
-        }
-        volume.verifyId(volume.getId());
-
         if (VolumeStructure.DIRECTORY_TREE_NAME.equals(td.getTreeName())) {
             return volume.getStructure().directoryExchange();
         } else {
@@ -321,4 +311,5 @@
     long getFailedUpdates() {
         return failedUpdates.get();
     }
+
 }

=== modified file 'src/main/java/com/persistit/TransactionPlayerSupport.java'
--- src/main/java/com/persistit/TransactionPlayerSupport.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/TransactionPlayerSupport.java	2012-10-06 02:46:19 +0000
@@ -17,17 +17,12 @@
 
 import java.nio.ByteBuffer;
 
-import com.persistit.JournalManager.TreeDescriptor;
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.PersistitIOException;
 
 interface TransactionPlayerSupport {
     Persistit getPersistit();
 
-    TreeDescriptor handleToTreeDescriptor(int treeHandle);
-
-    Volume handleToVolume(int volumeHandle);
-
     void read(long address, int size) throws PersistitIOException;
 
     ByteBuffer getReadBuffer();

=== modified file 'src/main/java/com/persistit/Volume.java'
--- src/main/java/com/persistit/Volume.java	2012-08-31 22:19:04 +0000
+++ src/main/java/com/persistit/Volume.java	2012-10-06 02:46:19 +0000
@@ -24,6 +24,7 @@
 import com.persistit.exception.PersistitException;
 import com.persistit.exception.ReadOnlyVolumeException;
 import com.persistit.exception.TruncateVolumeException;
+import com.persistit.exception.UnderSpecifiedVolumeException;
 import com.persistit.exception.VolumeAlreadyExistsException;
 import com.persistit.exception.VolumeClosedException;
 import com.persistit.exception.VolumeNotFoundException;
@@ -94,6 +95,7 @@
     Volume(final String name, final long id) {
         _name = name;
         _id = id;
+        _specification = new VolumeSpecification(name);
     }
 
     /**
@@ -144,13 +146,18 @@
         if (_specification != null) {
             throw new IllegalStateException("Volume " + this + " already has a VolumeSpecification");
         }
-        if (specification.getName().equals(_name) && specification.getId() == _id) {
+        if (specification.getName().equals(_name) && (specification.getId() == _id || specification.getId() == 0)) {
             _specification = specification;
         } else {
             throw new IllegalStateException("Volume " + this + " is incompatible with " + specification);
         }
     }
 
+    void overwriteSpecification(final VolumeSpecification specification) {
+        _specification = null;
+        setSpecification(specification);
+    }
+
     void closing() {
         _closing.set(true);
     }
@@ -238,8 +245,7 @@
                     //
                     // BufferPool#invalidate may fail and return false if other
                     // threads hold claims on pages of this volume. In that case
-                    // we
-                    // need to back off all locks and retry
+                    // we need to back off all locks and retry
                     //
                     if (getStructure().getPool().invalidate(this)) {
                         getStructure().truncate();
@@ -430,8 +436,11 @@
         if (_storage != null) {
             throw new IllegalStateException("This volume has already been opened");
         }
+        if (_specification.getPageSize() <= 0) {
+            throw new UnderSpecifiedVolumeException(getName());
+        }
         if (persistit.getBufferPool(_specification.getPageSize()) == null) {
-            throw new IllegalStateException("There is no buffer pool for pages of volume " + _specification);
+            throw new IllegalStateException(getName());
         }
         final boolean exists = VolumeHeader.verifyVolumeHeader(_specification, persistit.getCurrentTimestamp());
 
@@ -439,17 +448,27 @@
         _storage = new VolumeStorageV2(persistit, this);
         _statistics = new VolumeStatistics();
 
-        if (exists) {
-            if (_specification.isCreateOnly()) {
-                throw new VolumeAlreadyExistsException(_specification.getPath());
-            }
-            _storage.open();
-        } else {
-            if (!_specification.isCreate()) {
-                throw new VolumeNotFoundException(_specification.getPath());
-            }
-            _storage.create();
-
+        boolean opened = false;
+        try {
+            if (exists) {
+                if (_specification.isCreateOnly()) {
+                    throw new VolumeAlreadyExistsException(_specification.getPath());
+                }
+                _storage.open();
+                opened = true;
+            } else {
+                if (!_specification.isCreate()) {
+                    throw new VolumeNotFoundException(_specification.getPath());
+                }
+                _storage.create();
+                opened = true;
+            }
+        } finally {
+            if (!opened) {
+                _structure = null;
+                _storage = null;
+                _statistics = null;
+            }
         }
         persistit.addVolume(this);
     }

=== modified file 'src/main/java/com/persistit/VolumeSpecification.java'
--- src/main/java/com/persistit/VolumeSpecification.java	2012-08-31 22:19:04 +0000
+++ src/main/java/com/persistit/VolumeSpecification.java	2012-10-06 02:46:19 +0000
@@ -24,6 +24,7 @@
 
 import com.persistit.exception.InvalidVolumeSpecificationException;
 import com.persistit.exception.VolumeAlreadyExistsException;
+import com.persistit.util.Util;
 
 /**
  * A structure holding all the specification details for a {@link Volume}.
@@ -53,6 +54,7 @@
     private boolean readOnly = false;
     private boolean create = false;
     private boolean createOnly = false;
+    private boolean aliased = false;
 
     private int pageSize = -1;
     private int version = -1;
@@ -99,7 +101,11 @@
             final long maximumPages, final long extensionPages, final boolean create, final boolean createOnly,
             final boolean readOnly) {
         this.path = path;
-        this.name = name == null ? nameFromFile(new File(path)) : name;
+        if (name == null) {
+            this.name = nameFromFile(new File(path));
+        } else {
+            setName(name);
+        }
         this.pageSize = pageSize;
         this.initialPages = initialPages;
         this.maximumPages = maximumPages;
@@ -181,7 +187,7 @@
                 } else if (ATTR_NAME.equals(attr) || ATTR_ALIAS.equals(attr)) {
                     final String valueString = innerTokenizer.nextToken().trim();
                     if (valueString != null && !valueString.isEmpty()) {
-                        name = valueString;
+                        setName(valueString);
                     }
                 } else {
                     final String valueString = innerTokenizer.nextToken().trim();
@@ -302,6 +308,10 @@
         return path;
     }
 
+    public void setPath(final String path) {
+        this.path = path;
+    }
+
     public File getAbsoluteFile() {
         return new File(path).getAbsoluteFile();
     }
@@ -310,18 +320,39 @@
         return name;
     }
 
+    public void setName(final String name) {
+        this.aliased = !nameFromFile(new File(path)).equals(name);
+        this.name = name;
+    }
+
     public boolean isReadOnly() {
         return readOnly;
     }
 
+    public void setReadOnly(final boolean readOnly) {
+        this.readOnly = readOnly;
+    }
+
+    public boolean isAliased() {
+        return aliased;
+    }
+
     public boolean isCreate() {
         return create || createOnly;
     }
 
+    public void setCreate(final boolean create) {
+        this.create = create;
+    }
+
     public boolean isCreateOnly() {
         return createOnly;
     }
 
+    public void setCreateOnly(final boolean createOnly) {
+        this.createOnly = createOnly;
+    }
+
     public int getPageSize() {
         return pageSize;
     }
@@ -330,26 +361,56 @@
         return initialPages;
     }
 
+    void setInitialPages(final long initialPages) {
+        this.initialSize = sizeFromPages(initialPages);
+        this.initialPages = initialPages;
+    }
+
     public long getExtensionPages() {
         return extensionPages;
     }
 
+    void setExtensionPages(final long extensionPages) {
+        this.extensionSize = sizeFromPages(extensionPages);
+        this.extensionPages = extensionPages;
+    }
+
     public long getMaximumPages() {
         return maximumPages;
     }
 
+    void setMaximumPages(final long maximumPages) {
+        this.maximumSize = sizeFromPages(maximumPages);
+        this.maximumPages = maximumPages;
+    }
+
     public long getInitialSize() {
         return initialSize;
     }
 
+    public void setInitialSize(final long initialSize) {
+        this.initialPages = pagesFromSize(initialSize);
+        this.initialSize = roundSize(initialSize);
+    }
+
     public long getExtensionSize() {
         return extensionSize;
     }
 
+    public void setExtensionSize(final long extensionSize) {
+        this.extensionPages = pagesFromSize(extensionSize);
+        this.extensionSize = roundSize(extensionSize);
+    }
+
     public long getMaximumSize() {
         return maximumSize;
     }
 
+    public void setMaximumSize(final long maximumSize) {
+        this.maximumPages = pagesFromSize(maximumSize);
+        this.maximumSize = roundSize(maximumSize);
+    }
+
     public int getVersion() {
         return version;
     }
@@ -362,18 +423,17 @@
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append(path);
-        sb.append(',').append(ATTR_NAME).append(':').append(name);
-        sb.append(',').append(ATTR_PAGE_SIZE).append(':').append(pageSize);
-
-        if (initialPages >= 0) {
-            sb.append(',').append(ATTR_INITIAL_SIZE).append(':').append(ds(initialPages));
-        }
-        if (maximumPages >= 0) {
-            sb.append(',').append(ATTR_MAXIMUM_SIZE).append(':').append(ds(maximumPages));
-        }
-        if (extensionPages >= 0) {
-            sb.append(',').append(ATTR_EXTENSION_SIZE).append(':').append(ds(extensionPages));
-        }
+        if (aliased) {
+            sb.append(',').append(ATTR_NAME).append(':').append(name);
+        }
+        if (pageSize > 0) {
+            sb.append(',').append(ATTR_PAGE_SIZE).append(':').append(pageSize);
+        }
+
+        appendSize(sb, ATTR_INITIAL_SIZE, ATTR_INITIAL_PAGES, initialSize, initialPages);
+        appendSize(sb, ATTR_MAXIMUM_SIZE, ATTR_MAXIMUM_PAGES, maximumSize, maximumPages);
+        appendSize(sb, ATTR_EXTENSION_SIZE, ATTR_EXTENSION_PAGES, extensionSize, extensionPages);
+
         if (readOnly) {
             sb.append(',').append(ATTR_READONLY);
         }
@@ -385,36 +445,57 @@
         return sb.toString();
     }
 
-    private String ds(final long pages) {
-        return Configuration.displayableLongValue(pages * pageSize);
+    private void appendSize(final StringBuilder sb, final String sizeName, final String pagesName, final long size,
+            final long pages) {
+        if (pageSize <= 0) {
+            if (pages > 0) {
+                sb.append(',').append(pagesName).append(':').append(ds(pages));
+            } else if (size > 0) {
+                sb.append(',').append(sizeName).append(':').append(ds(size));
+            }
+        } else if (pages > 0) {
+            sb.append(',').append(sizeName).append(':').append(ds(pages * pageSize));
+        } else if (size > 0) {
+            sb.append(',').append(sizeName).append(':').append(ds(size));
+        }
+    }
+
+    @Override
+    public boolean equals(final Object object) {
+        if (!(object instanceof VolumeSpecification)) {
+            return false;
+        }
+        final VolumeSpecification v = (VolumeSpecification) object;
+        return path.equals(v.path) && name.equals(v.name) && readOnly == v.readOnly && create == v.create
+                && createOnly == v.createOnly && aliased == v.aliased && pageSize == v.pageSize && version == v.version
+                && id == v.id && initialPages == v.initialPages && initialSize == v.initialSize
+                && extensionPages == v.extensionPages && extensionSize == v.extensionSize
+                && maximumPages == v.maximumPages && maximumSize == v.maximumSize;
+    }
+
+    private String ds(final long s) {
+        return Configuration.displayableLongValue(s);
     }
 
     public String summary() {
         return name + "(" + path + ")";
     }
 
-    /**
-     * @param initialPages
-     *            the initialPages to set
-     */
-    void setInitialPages(final long initialPages) {
-        this.initialPages = initialPages;
-    }
-
-    /**
-     * @param extensionPages
-     *            the extensionPages to set
-     */
-    void setExtensionPages(final long extensionPages) {
-        this.extensionPages = extensionPages;
-    }
-
-    /**
-     * @param maximumPages
-     *            the maximumPages to set
-     */
-    void setMaximumPages(final long maximumPages) {
-        this.maximumPages = maximumPages;
-    }
-
+    private long sizeFromPages(final long pages) {
+        Util.rangeCheck(pages, 0, Long.MAX_VALUE / Buffer.MAX_BUFFER_SIZE);
+        return pageSize > 0 ? pages * pageSize : 0;
+    }
+
+    private long pagesFromSize(final long size) {
+        Util.rangeCheck(size, 0, Long.MAX_VALUE);
+        return pageSize > 0 ? size / pageSize : 0;
+    }
+
+    private long roundSize(final long size) {
+        if (pageSize > 0) {
+            return (size / pageSize) * pageSize;
+        } else {
+            return size;
+        }
+    }
 }

=== modified file 'src/main/java/com/persistit/VolumeStructure.java'
--- src/main/java/com/persistit/VolumeStructure.java	2012-09-28 21:39:44 +0000
+++ src/main/java/com/persistit/VolumeStructure.java	2012-10-06 02:46:19 +0000
@@ -117,6 +117,7 @@
     }
 
     synchronized void truncate() {
+        final long timestamp = _persistit.getTimestampAllocator().updateTimestamp();
         for (final WeakReference<Tree> treeRef : _treeNameHashMap.values()) {
             final Tree tree = treeRef.get();
             if (tree != null) {
@@ -124,6 +125,7 @@
             }
         }
         _treeNameHashMap.clear();
+        _persistit.getJournalManager().truncate(_volume, timestamp);
     }
 
     Exchange directoryExchange() {

=== removed file 'src/main/java/com/persistit/exception/MissingVolumeException.java'
--- src/main/java/com/persistit/exception/MissingVolumeException.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/exception/MissingVolumeException.java	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/**
- * 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.exception;
-
-/**
- * Thrown if the journal files refer to a volume that is no longer present in
- * the system. Generally this condition is irrecoverable because without the
- * missing volume a consistent database state cannot be restored. However, in
- * the event the removal of the volume is intentional, it is possible to specify
- * a mode in which pages and transactions destined for missing volumes are
- * ignored.
- * 
- * @version 1.0
- */
-public class MissingVolumeException extends CorruptJournalException {
-    private static final long serialVersionUID = -9014051945087375523L;
-    private final String _volumeName;
-
-    public MissingVolumeException(final String msg, final String volumeName) {
-        super(msg);
-        _volumeName = volumeName;
-    }
-
-    public String getVolumeName() {
-        return _volumeName;
-    }
-}

=== added file 'src/main/java/com/persistit/exception/UnderSpecifiedVolumeException.java'
--- src/main/java/com/persistit/exception/UnderSpecifiedVolumeException.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/persistit/exception/UnderSpecifiedVolumeException.java	2012-10-06 02:46:19 +0000
@@ -0,0 +1,36 @@
+/**
+ * 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.exception;
+
+import com.persistit.VolumeSpecification;
+
+/**
+ * Thrown when the Persistit attempts to open a Volume with an incomplete
+ * {@link VolumeSpecification}, for example, with a missing page size.
+ * 
+ * @version 1.0
+ */
+public class UnderSpecifiedVolumeException extends VolumeNotFoundException {
+    private static final long serialVersionUID = -5547869858193325359L;
+
+    public UnderSpecifiedVolumeException() {
+        super();
+    }
+
+    public UnderSpecifiedVolumeException(final String msg) {
+        super(msg);
+    }
+}

=== modified file 'src/test/java/com/persistit/Bug1041293Test.java'
--- src/test/java/com/persistit/Bug1041293Test.java	2012-09-12 20:36:27 +0000
+++ src/test/java/com/persistit/Bug1041293Test.java	2012-10-06 02:46:19 +0000
@@ -17,6 +17,8 @@
 
 import org.junit.Test;
 
+import com.persistit.exception.UnderSpecifiedVolumeException;
+
 /**
  * https://bugs.launchpad.net/akiban-persistit/+bug/1041293
  * 
@@ -29,6 +31,14 @@
 
 public class Bug1041293Test extends PersistitUnitTestCase {
 
+    @Test(expected = UnderSpecifiedVolumeException.class)
+    public void underSpecifiedVolume() throws Exception {
+        final Configuration config = _persistit.getConfiguration();
+        final VolumeSpecification vspec = config.volumeSpecification("${datapath}/test");
+        final Volume volume = _persistit.loadVolume(vspec);
+        volume.open(_persistit);
+    }
+
     @Test(expected = IllegalStateException.class)
     public void mismatchedVolumeSpecificationNPE() throws Exception {
         final Configuration config = _persistit.getConfiguration();

=== added file 'src/test/java/com/persistit/CreateAndDeleteVolumeTest.java'
--- src/test/java/com/persistit/CreateAndDeleteVolumeTest.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/persistit/CreateAndDeleteVolumeTest.java	2012-10-06 02:46:19 +0000
@@ -0,0 +1,171 @@
+/**
+ * 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 com.persistit.unit.UnitTestProperties.DATA_PATH;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class CreateAndDeleteVolumeTest extends PersistitUnitTestCase {
+
+    /**
+     * Test for https://bugs.launchpad.net/akiban-persistit/+bug/1045971
+     * 
+     * Dynamically loaded volumes not recovered "cleanly"
+     * 
+     * When a program creates new volumes using VolumeSpecifications, they
+     * subsequently cause a "missing volume" warning from the journal copier and
+     * prevent the removal of journal files containing the references. The
+     * journal files accumulate seemingly without end, and each initialization
+     * of the database seems to process more and more of the old transactions.
+     * 
+     * With thanks to jb5
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void recoverDynamicVolumes() throws Exception {
+        VolumeSpecification volumeSpec;
+        final Configuration configuration = _persistit.getConfiguration();
+        _persistit.close();
+        int remainingJournalFiles = 0;
+
+        for (int i = 5; --i >= 0;) {
+            final Persistit db = new Persistit();
+            try {
+                db.initialize(configuration);
+                volumeSpec = new VolumeSpecification(DATA_PATH + "/hwdemo" + i, null, 16384, 1, 1000, 1, true, false,
+                        false);
+                db.loadVolume(volumeSpec);
+                final Exchange dbex = db.getExchange("hwdemo" + i, "greetings", true);
+                dbex.getKey().append("Hello");
+                dbex.getValue().put("World");
+                dbex.store();
+                dbex.getKey().to(Key.BEFORE);
+                db.releaseExchange(dbex);
+            } finally {
+                if (i == 0) {
+                    db.copyBackPages();
+                }
+                remainingJournalFiles = db.getJournalManager().getJournalFileCount();
+                db.close();
+            }
+        }
+        assertEquals("Should be only one remaining journal file", 1, remainingJournalFiles);
+    }
+
+    @Test
+    public void useOldVSpecInducesExpectedFailure() throws Exception {
+        VolumeSpecification volumeSpec;
+        final Configuration configuration = _persistit.getConfiguration();
+        _persistit.close();
+        int remainingJournalFiles = 0;
+        configuration.setUseOldVSpec(true);
+
+        for (int i = 5; --i >= 0;) {
+            final Persistit db = new Persistit();
+            try {
+                db.initialize(configuration);
+                volumeSpec = new VolumeSpecification(DATA_PATH + "/hwdemo" + i, null, 16384, 1, 1000, 1, true, false,
+                        false);
+                db.loadVolume(volumeSpec);
+                final Exchange dbex = db.getExchange("hwdemo" + i, "greetings", true);
+                dbex.getKey().append("Hello");
+                dbex.getValue().put("World");
+                dbex.store();
+                dbex.getKey().to(Key.BEFORE);
+                db.releaseExchange(dbex);
+            } finally {
+                if (i == 0) {
+                    db.copyBackPages();
+                }
+                remainingJournalFiles = db.getJournalManager().getJournalFileCount();
+                db.close();
+            }
+        }
+        assertTrue("Should be only one remaining journal file", remainingJournalFiles > 1);
+
+    }
+
+    /**
+     * Test for bug https://bugs.launchpad.net/akiban-persistit/+bug/1045983
+     * 
+     * Truncating a dynamically created volume results in corrupted journal If
+     * you dynamically load a volume, truncate it (without adding any trees),
+     * and then close it, the next time the database is initialized a fatal
+     * exception is thrown:
+     * 
+     * <code><pre>
+     * 
+     * [JOURNAL_COPIER] WARNING Missing volume truncated referenced at journal address 364
+     * [main] WARNING Missing volume truncated referenced at journal address 17,004 (6 similar occurrences in 0 seconds)
+     * Exception in thread "main" com.persistit.exception.InvalidPageAddressException: Page 1 out of bounds [0-1]
+     *  at com.persistit.VolumeStorageV2.readPage(VolumeStorageV2.java:426)
+     *  at com.persistit.Buffer.load(Buffer.java:456)
+     *  at com.persistit.BufferPool.get(BufferPool.java:780)
+     *  at com.persistit.Tree.setRootPageAddress(Tree.java:203)
+     *  at com.persistit.VolumeStructure.init(VolumeStructure.java:70)
+     *  at com.persistit.VolumeStorageV2.open(VolumeStorageV2.java:217)
+     *  at com.persistit.Volume.open(Volume.java:442)
+     *  at com.persistit.Persistit.loadVolume(Persistit.java:1066)
+     *  at Truncate.main(Truncate.java:30)
+     * 
+     * @throws Exception
+     * 
+     *             </pre></code>
+     * 
+     *             This test is currently disabled pending a fix.
+     * 
+     */
+    @Test
+    @Ignore
+    public void truncateDynamicVolumes() throws Exception {
+
+        VolumeSpecification volumeSpec;
+        final Configuration configuration = _persistit.getConfiguration();
+        _persistit.close();
+
+        final Persistit db = new Persistit();
+
+        for (int i = 0; i < 2; i++) {
+            try {
+                db.initialize(configuration);
+                volumeSpec = new VolumeSpecification(DATA_PATH + "/truncated", null, 16384, 1, 1000, 1, true, false,
+                        false);
+                final Volume volume = db.loadVolume(volumeSpec);
+                volume.truncate();
+                // the following may be omitted, and the problem still exhibited
+                final Exchange dbex = db.getExchange("truncated", "greetings", true);
+                dbex.getKey().append("ave");
+                dbex.getValue().put("mundus");
+                dbex.store();
+                dbex.getKey().to(Key.BEFORE);
+                while (dbex.next()) {
+                    System.out.println(dbex.getKey().reset().decode() + " " + dbex.getValue().get());
+                }
+                db.releaseExchange(dbex);
+                // the preceding may be omitted, and the problem still exhibited
+            } finally {
+                db.close();
+            }
+        }
+
+    }
+
+}

=== modified file 'src/test/java/com/persistit/RecoveryTest.java'
--- src/test/java/com/persistit/RecoveryTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/RecoveryTest.java	2012-10-06 02:46:19 +0000
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -498,7 +499,57 @@
         for (int i = 0; i < count + 100; i++) {
             assertEquals(i < count, exchange.to(i).isValueDefined());
         }
-
+    }
+
+    /*
+     * Deprecated because the useOldVSpec param will go away soon.
+     */
+    @Test
+    @Deprecated
+    public void testNormalRestartUseOldVSpec() throws Exception {
+        final Configuration config = _persistit.getConfiguration();
+        _persistit.close();
+        UnitTestProperties.cleanUpDirectory(new File(UnitTestProperties.DATA_PATH));
+        config.setUseOldVSpec(true);
+        _persistit = new Persistit();
+        _persistit.initialize(config);
+
+        final JournalManager jman = _persistit.getJournalManager();
+        Exchange exchange = _persistit.getExchange(_volumeName, "RecoveryTest", true);
+        exchange.getValue().put(RED_FOX);
+        int count = 0;
+        long checkpointAddr = 0;
+        for (; jman.getCurrentAddress() < jman.getBlockSize() * 1.25;) {
+            if (jman.getCurrentAddress() - checkpointAddr > jman.getBlockSize() * 0.8) {
+                _persistit.checkpoint();
+                checkpointAddr = jman.getCurrentAddress();
+            }
+            exchange.to(count).store();
+            count++;
+        }
+        for (int i = 0; i < count + 100; i++) {
+            assertEquals(i < count, exchange.to(i).isValueDefined());
+        }
+        _persistit.close();
+
+        _persistit = new Persistit();
+        _persistit.initialize(config);
+        exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
+        for (int i = 0; i < count + 100; i++) {
+            if (i < count && !exchange.to(i).isValueDefined()) {
+                System.out.println("i=" + i + " count=" + count);
+                break;
+            }
+            assertEquals(i < count, exchange.to(i).isValueDefined());
+        }
+
+        _persistit.close();
+        _persistit = new Persistit();
+        _persistit.initialize(config);
+        exchange = _persistit.getExchange(_volumeName, "RecoveryTest", false);
+        for (int i = 0; i < count + 100; i++) {
+            assertEquals(i < count, exchange.to(i).isValueDefined());
+        }
     }
 
     private void store0() throws PersistitException {

=== modified file 'src/test/java/com/persistit/VolumeTest.java'
--- src/test/java/com/persistit/VolumeTest.java	2012-08-24 13:57:19 +0000
+++ src/test/java/com/persistit/VolumeTest.java	2012-10-06 02:46:19 +0000
@@ -51,11 +51,6 @@
             // ok
         }
         try {
-            assertNull(volume.getSpecification());
-        } catch (final IllegalStateException e) {
-            // ok
-        }
-        try {
             assertNull(volume.getStructure());
         } catch (final IllegalStateException e) {
             // ok
@@ -138,6 +133,7 @@
     @Test
     public void testVolumeSpecification() throws Exception {
         VolumeSpecification vs;
+        VolumeSpecification vs2;
 
         vs = validVolumeSpecification("/a/b/c,name: crabcake, pageSize: 16384, initialSize: 10m, maximumSize: 100m, extensionSize: 10m, create");
         vs = validVolumeSpecification("/a/b/c,name:crabcake,pageSize:16384,initialSize:10m,maximumSize:100m,extensionSize:10m,create");
@@ -146,8 +142,11 @@
         assertEquals(10 * 1024 * 1024 / 16384, vs.getInitialPages());
         assertEquals(10 * 1024 * 1024, vs.getInitialSize());
         assertTrue(vs.isCreate());
+        assertTrue(vs.isAliased());
         assertFalse(vs.isCreateOnly());
         assertFalse(vs.isReadOnly());
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
 
         vs = validVolumeSpecification("/a/b/c");
         assertEquals("c", vs.getName());
@@ -155,16 +154,43 @@
         assertFalse(vs.isCreate());
         assertFalse(vs.isCreateOnly());
         assertFalse(vs.isReadOnly());
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
 
         vs = validVolumeSpecification("/a/b/c.v01");
         assertEquals("c", vs.getName());
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
+
         vs = validVolumeSpecification("/a/b/c.d.v01");
         assertEquals("c.d", vs.getName());
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
 
         invalidVolumeSpecification("/a/b/c,name:crabcake,pagesize:16383,initialsize:10m,maximumsize:100m,extensionsize:10m,create");
         invalidVolumeSpecification("/a/b/c;name:crabcake,pagesize:16384,initialsize:10m,maximumsize:100m,extensionsize:10m,create");
         invalidVolumeSpecification("/a/b/c,name:crabcake,pagesize:16384,initialsize:10p,maximumsize:100p,extensionsize:10p,create");
         invalidVolumeSpecification("/a/b/c,name:crabcake,pagesize:16384,initialsize:10m,maximumsize:100m,extensionsize:10m,create,readOnly");
+
+        vs = validVolumeSpecification("/a/b/c,pageSize: 16384, initialSize: 10m, maximumSize: 100m, extensionSize: 10m, create");
+        assertEquals(10 * 1024 * 1024 / 16384, vs.getInitialPages());
+        assertEquals(10 * 1024 * 1024, vs.getInitialSize());
+        vs.setInitialPages(42);
+        vs.setExtensionPages(58);
+        vs.setMaximumPages(Integer.MAX_VALUE);
+
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
+
+        vs.setMaximumSize(Long.MAX_VALUE);
+        vs.setInitialSize(Long.MAX_VALUE / 7);
+        vs.setExtensionSize(Long.MAX_VALUE / 23);
+
+        assertEquals(Long.MAX_VALUE / 23 / 16384, vs.getExtensionPages());
+
+        vs2 = validVolumeSpecification(vs.toString());
+        assertEquals("Parse of toString should be equal", vs, vs2);
+
     }
 
     @Test