QUEUE-130: Addressed review comments

Author: james-mcsherry

src/main/java/net/openhft/chronicle/queue/impl/single/StoreAppender.java

@@ -629,7 +629,9 @@ public void normaliseEOFs() {
         final WriteLock writeLock = queue.writeLock();
         writeLock.lock();
         try {
-            normaliseEOFs0(cycle);
+            // use the getter, not the raw field: after the construction-time back-scan releases its
+            // parked store the field is Integer.MIN_VALUE, and the getter resolves that to lastCycle
+            normaliseEOFs0(cycle());
         } finally {
             writeLock.unlock();
             long tookMillis = (System.nanoTime() - start) / 1_000_000;

src/test/java/net/openhft/chronicle/queue/impl/single/AppenderReleasesParkedStoreTest.java

@@ -3,7 +3,7 @@
  */
 package net.openhft.chronicle.queue.impl.single;
 
-import net.openhft.chronicle.core.Jvm;
+import net.openhft.chronicle.core.io.BackgroundResourceReleaser;
 import net.openhft.chronicle.queue.util.FileUtil;
 import org.junit.jupiter.api.Test;
 
@@ -68,15 +68,17 @@ void parkedAppenderDoesNotPinAnOldCycle() {
         }
     }
 
-    // All roll-cycle files, earliest first; the pause lets freshly rolled files appear.
+    // All roll-cycle files, earliest first.
     private List<File> cycleFiles() {
         final File[] files = queue.file().listFiles(FileUtil::hasQueueSuffix);
         assertNotNull(files, "no queue files found in " + queue.file());
         return Stream.of(files).sorted(EARLIEST_FIRST).collect(toList());
     }
 
-    // Removable candidates, earliest first; the pause lets rolled-off files be released first.
+    // Removable candidates, earliest first. The parked store's file descriptor is dropped on a
+    // background thread, so drain the releaser before inspecting open descriptors.
     private List<File> removableCandidates() {
+        BackgroundResourceReleaser.releasePendingResources();
         final List<File> candidates = FileUtil.removableRollFileCandidates(queue.file()).collect(toList());
         assertEquals(candidates.stream().sorted(EARLIEST_FIRST).collect(toList()), candidates);
         return candidates;

src/test/java/net/openhft/chronicle/queue/impl/single/NormaliseEOFsTest.java

@@ -98,6 +98,34 @@ public void normaliseShouldResumeFromPreviousNormalisation() {
         }
     }
 
+    // A freshly constructed appender parks on the current cycle during its EOF back-scan and then
+    // releases that store, leaving its cycle field unset. normaliseEOFs() must still finalise the older
+    // cycles rather than silently no-op - the watermark it advances is "normalisedEOFsTo" in the table store.
+    @Test
+    public void freshlyConstructedAppenderNormalisesWithoutWriting() {
+        SetTimeProvider setTimeProvider = new SetTimeProvider();
+        try (final SingleChronicleQueue queue = createQueue(setTimeProvider);
+             final ExcerptAppender writer = queue.createAppender()) {
+            writer.writeText("cycle-0");
+            setTimeProvider.advanceMillis(1_001);
+            writer.writeText("cycle-1");
+            setTimeProvider.advanceMillis(1_001);
+            writer.writeText("cycle-2");
+
+            final int firstCycle = queue.firstCycle();
+            try (final ExcerptAppender fresh = queue.createAppender()) {
+                final long normalisedBefore = queue.tableStoreAcquire("normalisedEOFsTo", firstCycle).getVolatileValue();
+
+                fresh.normaliseEOFs();
+
+                final long normalisedAfter = queue.tableStoreAcquire("normalisedEOFsTo", firstCycle).getVolatileValue();
+                assertTrue(normalisedAfter > normalisedBefore,
+                        "normaliseEOFs on a never-written appender should have advanced the watermark past "
+                                + normalisedBefore + " but it stayed at " + normalisedAfter);
+            }
+        }
+    }
+
     private void createNewRollCycles(ExcerptAppender appender, SetTimeProvider timeProvider) {
         for (int i = 0; i < 10; i++) {
             timeProvider.advanceMillis(3_000);