remove assertion from store rebuild code. A swap log entry might be

"newer" if we're in a slow rebuild.  In that case the swap log entry
should be ignored, assuming the existing entry was added during the
rebuild.

diff --git a/src/store.cc b/src/store.cc
index f1e2cd3557b75f27aefd913cbd8432a82a9f405f..b185332b727427bd51f27d86c11109e88e7d93ea 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.257 1997/06/17 18:58:19 wessels Exp $
+ * $Id: store.cc,v 1.258 1997/06/18 03:06:22 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -1389,13 +1389,16 @@ storeDoRebuildFromDisk(void *data)
             * newer entry. */
            debug(20, 1) ("WARNING: newer swaplog entry for fileno %08X\n",
                sfileno);
-           assert(newer == 0);
            /* I'm tempted to remove the swapfile here just to be safe,
             * but there is a bad race condition in the NOVM version if
             * the swapfile has recently been opened for writing, but
             * not yet opened for reading.  Because we can't map
             * swapfiles back to StoreEntrys, we don't know the state
             * of the entry using that file.  */
+           /* We'll assume the existing entry is valid, probably because
+              were in a slow rebuild and the the swap file number got taken
+              and the validation procedure hasn't run. */
+           assert(RB->need_to_validate);
            RB->clashcount++;
            continue;
        } else if (e) {