From 5bee94bb386127d497cc81238305b041b3f1ebd0 Mon Sep 17 00:00:00 2001
From: Badrish Chandramouli <badrishc@microsoft.com>
Date: Wed, 2 Aug 2023 18:11:09 -0700
Subject: [PATCH] Fix edge case for incremental snapshot (#858)

---
 cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs b/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs
index e9ec3b5a2..d36f2c176 100644
--- a/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs
+++ b/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs
@@ -322,7 +322,6 @@ public override void GlobalBeforeEnteringState<Key, Value>(SystemState next, Fas
                 case Phase.WAIT_FLUSH:
                     base.GlobalBeforeEnteringState(next, faster);
                     faster._hybridLogCheckpoint.info.finalLogicalAddress = faster.hlog.GetTailAddress();
-                    faster._hybridLogCheckpoint.info.snapshotStartFlushedLogicalAddress = faster.hlog.FlushedUntilAddress;
 
                     if (faster._hybridLogCheckpoint.deltaLog == null)
                     {
@@ -337,7 +336,7 @@ public override void GlobalBeforeEnteringState<Key, Value>(SystemState next, Fas
                     // resuming epoch protection if necessary. Correctness is not affected as we will
                     // only read safe pages during recovery.
                     faster.hlog.AsyncFlushDeltaToDevice(
-                        faster._hybridLogCheckpoint.info.snapshotStartFlushedLogicalAddress,
+                        faster.hlog.FlushedUntilAddress,
                         faster._hybridLogCheckpoint.info.finalLogicalAddress,
                         faster._lastSnapshotCheckpoint.info.finalLogicalAddress,
                         faster._hybridLogCheckpoint.prevVersion,
@@ -346,8 +345,6 @@ public override void GlobalBeforeEnteringState<Key, Value>(SystemState next, Fas
                         faster.ThrottleCheckpointFlushDelayMs);
                     break;
                 case Phase.PERSISTENCE_CALLBACK:
-                    // Set actual FlushedUntil to the latest possible data in main log that is on disk
-                    faster._hybridLogCheckpoint.info.flushedLogicalAddress = faster.hlog.FlushedUntilAddress;
                     CollectMetadata(next, faster);
                     faster.WriteHybridLogIncrementalMetaInfo(faster._hybridLogCheckpoint.deltaLog);
                     faster._hybridLogCheckpoint.info.deltaTailAddress = faster._hybridLogCheckpoint.deltaLog.TailAddress;