Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Checkpoint Version Shift for Diskless Replication #1068

Merged
merged 8 commits into from
Mar 7, 2025
Merged

Fix Checkpoint Version Shift for Diskless Replication #1068

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
863ac5f
correctly add commit marker for streaming checkpoint in the AOF
vazois Mar 5, 2025
78de1c2
enqueue only on checkpoint version shift
vazois Mar 5, 2025
644ea43
remove default value
vazois Mar 5, 2025
7037f2e
rename checkpoint start marker
vazois Mar 6, 2025
ca1c49f
add end marker and change enqueue
vazois Mar 6, 2025
9044eb9
guard checkpoint end marker commit using EnableCluster flag
vazois Mar 6, 2025
1d4b003
Merge branch 'main' into vazois/diskless-checkpoint-marker
vazois Mar 6, 2025
d639947
Merge branch 'main' into vazois/diskless-checkpoint-marker
vazois Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .../cluster/Server/Replication/PrimaryOps/DisklessReplication/ReplicationSnapshotIterator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ public void OnStop(bool completed, long numberOfRecords, bool isMainStore, long
// Wait for flush and response to complete
replicationSyncManager.WaitForFlush().GetAwaiter().GetResult();

// Enqueue version change commit
replicationSyncManager.ClusterProvider.storeWrapper.EnqueueCommit(isMainStore, targetVersion);

logger?.LogTrace("{OnStop} {store} {numberOfRecords} {targetVersion}",
nameof(OnStop), isMainStore ? "MAIN STORE" : "OBJECT STORE", numberOfRecords, targetVersion);

Expand Down
2 changes: 1 addition & 1 deletion libs/cluster/Server/Replication/ReplicationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void CheckpointVersionShift(bool isMainStore, long oldVersion, long newVersion)
{
if (clusterProvider.clusterManager.CurrentConfig.LocalNodeRole == NodeRole.REPLICA)
return;
storeWrapper.EnqueueCommit(isMainStore, newVersion, streaming: true);
storeWrapper.EnqueueCommit(isMainStore, newVersion, diskless: clusterProvider.serverOptions.ReplicaDisklessSync);
}

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions libs/server/StoreWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,16 +497,16 @@ void DoCompaction()
/// </summary>
/// <param name="isMainStore"></param>
/// <param name="version"></param>
/// <param name="streaming"></param>
public void EnqueueCommit(bool isMainStore, long version, bool streaming = false)
/// <param name="diskless"></param>
public void EnqueueCommit(bool isMainStore, long version, bool diskless)
{
var opType = streaming ?
isMainStore ? AofEntryType.MainStoreStreamingCheckpointCommit : AofEntryType.ObjectStoreStreamingCheckpointCommit :
isMainStore ? AofEntryType.MainStoreCheckpointCommit : AofEntryType.ObjectStoreCheckpointCommit;
var opType = diskless ?
(isMainStore ? AofEntryType.MainStoreStreamingCheckpointCommit : AofEntryType.ObjectStoreStreamingCheckpointCommit) :
(isMainStore ? AofEntryType.MainStoreCheckpointCommit : AofEntryType.ObjectStoreCheckpointCommit);

AofHeader header = new()
{
opType = isMainStore ? AofEntryType.MainStoreCheckpointCommit : AofEntryType.ObjectStoreCheckpointCommit,
opType = opType,
storeVersion = version,
sessionID = -1
};
Expand Down