Allow truncation if main store is checkpointed and object store is di…

…sabled
microsoft · Jun 22, 2024 · c7f7c05 · c7f7c05
1 parent 6f84989
commit c7f7c05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/libs/cluster/Server/ClusterProvider.cs b/libs/cluster/Server/ClusterProvider.cs
@@ -156,6 +156,10 @@ public void SafeTruncateAOF(StoreType storeType, bool full, long CheckpointCover
             // Used to delete old checkpoints and cleanup and also cleanup during attachment to new primary
             replicationManager.AddCheckpointEntry(entry, storeType, full);
 
+            // Only truncate AOF if 1) both stores were checkpointed OR 2) only Main was checkpointed but Object was not enabled
+            if (storeType != StoreType.All && !(storeType == StoreType.Main && serverOptions.DisableObjects))
+                return;
+
             if (clusterManager.CurrentConfig.LocalNodeRole == NodeRole.PRIMARY)
                 _ = replicationManager.SafeTruncateAof(CheckpointCoveredAofAddress);
             else

diff --git a/libs/server/StoreWrapper.cs b/libs/server/StoreWrapper.cs
@@ -694,8 +694,6 @@ private async Task InitiateCheckpoint(bool full, CheckpointType checkpointType,
                     objectStoreCheckpointResult = await objectStore.TakeHybridLogCheckpointAsync(checkpointType, tryIncremental);
             }
 
-            // Only truncate AOF if both stores are checkpointed
-            if (storeType == StoreType.All)
             {
                 // If cluster is enabled the replication manager is responsible for truncating AOF
                 if (serverOptions.EnableCluster && serverOptions.EnableAOF)
@@ -704,8 +702,11 @@ private async Task InitiateCheckpoint(bool full, CheckpointType checkpointType,
                 }
                 else
                 {
-                    appendOnlyFile?.TruncateUntil(CheckpointCoveredAofAddress);
-                    appendOnlyFile?.Commit();
+                    if (storeType == StoreType.All || (storeType == StoreType.Main && serverOptions.DisableObjects))
+                    {
+                        appendOnlyFile?.TruncateUntil(CheckpointCoveredAofAddress);
+                        appendOnlyFile?.Commit();
+                    }
                 }
             }