Make sure version switch is called for some checkpoint types

microsoft · May 18, 2023 · 3450702 · 3450702
1 parent 8da1898
commit 3450702
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs b/cs/src/core/Index/Synchronization/HybridLogCheckpointTask.cs
@@ -148,6 +148,10 @@ internal sealed class FoldOverCheckpointTask : HybridLogCheckpointOrchestrationT
             {
                 faster._lastSnapshotCheckpoint.Dispose();
             }
+
+            if (next.Phase == Phase.IN_PROGRESS)
+                base.GlobalBeforeEnteringState(next, faster);
+
             if (next.Phase != Phase.WAIT_FLUSH) return;
 
             faster.hlog.ShiftReadOnlyToTail(out var tailAddress,
@@ -186,7 +190,7 @@ internal sealed class FoldOverCheckpointTask : HybridLogCheckpointOrchestrationT
                 if (ctx is not null)
                     ctx.prevCtx.markers[EpochPhaseIdx.WaitFlush] = true;
             }
-            
+
             faster.epoch.Mark(EpochPhaseIdx.WaitFlush, current.Version);
             if (faster.epoch.CheckIsComplete(EpochPhaseIdx.WaitFlush, current.Version))
                 faster.GlobalStateMachineStep(current);
@@ -288,7 +292,7 @@ internal sealed class SnapshotCheckpointTask : HybridLogCheckpointOrchestrationT
                 if (ctx is not null)
                     ctx.prevCtx.markers[EpochPhaseIdx.WaitFlush] = true;
             }
-            
+
             faster.epoch.Mark(EpochPhaseIdx.WaitFlush, current.Version);
             if (faster.epoch.CheckIsComplete(EpochPhaseIdx.WaitFlush, current.Version))
                 faster.GlobalStateMachineStep(current);
@@ -312,6 +316,9 @@ internal sealed class IncrementalSnapshotCheckpointTask : HybridLogCheckpointOrc
                     base.GlobalBeforeEnteringState(next, faster);
                     faster._hybridLogCheckpoint.prevVersion = next.Version;
                     break;
+                case Phase.IN_PROGRESS:
+                    base.GlobalBeforeEnteringState(next, faster);
+                    break;
                 case Phase.WAIT_FLUSH:
                     base.GlobalBeforeEnteringState(next, faster);
                     faster._hybridLogCheckpoint.info.finalLogicalAddress = faster.hlog.GetTailAddress();
@@ -381,7 +388,7 @@ internal sealed class IncrementalSnapshotCheckpointTask : HybridLogCheckpointOrc
                 if (ctx is not null)
                     ctx.prevCtx.markers[EpochPhaseIdx.WaitFlush] = true;
             }
-            
+
             faster.epoch.Mark(EpochPhaseIdx.WaitFlush, current.Version);
             if (faster.epoch.CheckIsComplete(EpochPhaseIdx.WaitFlush, current.Version))
                 faster.GlobalStateMachineStep(current);