fix SafeRedundantBefore initialisation

Author: belliottsmith

modules/accord

@@ -545,14 +545,21 @@ public void unsafeUpsertRedundantBefore(RedundantBefore addRedundantBefore)
         super.unsafeUpsertRedundantBefore(addRedundantBefore);
     }
 
+    @VisibleForTesting
+    public void unsafeUpdateRangesForEpoch()
+    {
+        super.unsafeUpdateRangesForEpoch();
+        safeRedundantBefore = new SafeRedundantBefore(0, unsafeGetRedundantBefore());
+    }
+
     public static class AccordCommandStoreReplayer extends AbstractReplayer
     {
         private final AccordCommandStore commandStore;
         private final boolean onlyNonDurable;
 
         private AccordCommandStoreReplayer(AccordCommandStore commandStore, boolean onlyNonDurable)
         {
-            super(commandStore);
+            super(commandStore, null);
             this.commandStore = commandStore;
             this.onlyNonDurable = onlyNonDurable;
         }
@@ -579,12 +586,16 @@ public AsyncChain<Route> replay(TxnId txnId)
 
     void maybeLoadRedundantBefore(RedundantBefore redundantBefore)
     {
+        Invariants.require(safeRedundantBefore == null);
         if (redundantBefore != null)
         {
             loadRedundantBefore(redundantBefore);
-            Invariants.require(safeRedundantBefore == null);
             safeRedundantBefore = new SafeRedundantBefore(0, redundantBefore);
         }
+        else
+        {
+            safeRedundantBefore = new SafeRedundantBefore(0, this.unsafeGetRedundantBefore());
+        }
     }
 
     void maybeLoadBootstrapBeganAt(NavigableMap<TxnId, Ranges> bootstrapBeganAt)

src/java/org/apache/cassandra/service/accord/AccordCommandStore.java

@@ -630,7 +630,7 @@ public ReplayStream(CommandStore commandStore)
                 this.commandStore = commandStore;
                 this.replayer = (AbstractReplayer) commandStore.replayer();
                 // Keys in the index are sorted by command store id, so index iteration will be sequential
-                this.iter = journalTable.keyIterator(new JournalKey(replayer.minReplay, COMMAND_DIFF, commandStore.id()), new JournalKey(TxnId.MAX.withoutNonIdentityFlags(), COMMAND_DIFF, commandStore.id()), false);
+                this.iter = journalTable.keyIterator(new JournalKey(replayer.minReplay.withoutNonIdentityFlags(), COMMAND_DIFF, commandStore.id()), new JournalKey(TxnId.MAX.withoutNonIdentityFlags(), COMMAND_DIFF, commandStore.id()), false);
             }
 
             boolean replay()

src/java/org/apache/cassandra/service/accord/AccordJournal.java

@@ -54,6 +54,7 @@
 import accord.utils.PersistentField;
 import accord.utils.RandomSource;
 import org.apache.cassandra.ServerTestUtils;
+import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.Directories;
 import org.apache.cassandra.db.Keyspace;
@@ -69,6 +70,7 @@
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.io.util.File;
 import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.Params;
 import org.apache.cassandra.journal.SegmentCompactor;
 import org.apache.cassandra.journal.StaticSegment;
 import org.apache.cassandra.journal.TestParams;
@@ -140,7 +142,8 @@ public void beforeTest() throws Throwable
     @Test
     public void testOne()
     {
-        long seed = System.nanoTime();
+//        long seed = System.nanoTime();
+        long seed = 31954502422236224L;
         int operations = 1000;
 
         logger.info("Seed: {}", seed);