some merge fixes

microsoft · Mar 5, 2025 · 52e8339 · 52e8339
1 parent 8476e35
commit 52e8339
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/.../cluster/Server/Replication/PrimaryOps/DisklessReplication/ReplicationSnapshotIterator.cs b/.../cluster/Server/Replication/PrimaryOps/DisklessReplication/ReplicationSnapshotIterator.cs
@@ -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);
 

diff --git a/libs/cluster/Server/Replication/ReplicationManager.cs b/libs/cluster/Server/Replication/ReplicationManager.cs
@@ -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>

diff --git a/libs/server/Databases/DatabaseManagerBase.cs b/libs/server/Databases/DatabaseManagerBase.cs
@@ -113,7 +113,7 @@ public abstract Task TaskCheckpointBasedOnAofSizeLimitAsync(long aofSizeLimit,
         public abstract void ResetRevivificationStats();
 
         /// <inheritdoc/>
-        public abstract void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool streaming = false);
+        public abstract void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool diskless = false);
 
         /// <inheritdoc/>
         public abstract GarnetDatabase[] GetDatabasesSnapshot();

diff --git a/libs/server/Databases/IDatabaseManager.cs b/libs/server/Databases/IDatabaseManager.cs
@@ -188,8 +188,8 @@ public Task TaskCheckpointBasedOnAofSizeLimitAsync(long aofSizeLimit, Cancellati
         /// <param name="isMainStore"></param>
         /// <param name="version"></param>
         /// <param name="dbId"></param>
-        /// <param name="streaming"></param>
-        public void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool streaming = false);
+        /// <param name="diskless"></param>
+        public void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool diskless = false);
 
         /// <summary>
         /// Get a snapshot of all active databases

diff --git a/libs/server/Databases/MultiDatabaseManager.cs b/libs/server/Databases/MultiDatabaseManager.cs
@@ -540,12 +540,12 @@ public override void ResetRevivificationStats()
             }
         }
 
-        public override void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool streaming = false)
+        public override void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool diskless = false)
         {
             if (!TryGetOrAddDatabase(dbId, out var db))
                 throw new GarnetException($"Database with ID {dbId} was not found.");
 
-            EnqueueDatabaseCommit(ref db, isMainStore, version, streaming);
+            EnqueueDatabaseCommit(ref db, isMainStore, version, diskless);
         }
 
         /// <inheritdoc/>

diff --git a/libs/server/Databases/SingleDatabaseManager.cs b/libs/server/Databases/SingleDatabaseManager.cs
@@ -284,11 +284,11 @@ public override void ResetRevivificationStats()
         }
 
         /// <inheritdoc/>
-        public override void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool streaming = false)
+        public override void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool diskless = false)
         {
             ArgumentOutOfRangeException.ThrowIfNotEqual(dbId, 0);
 
-            EnqueueDatabaseCommit(ref DefaultDatabase, isMainStore, version, streaming);
+            EnqueueDatabaseCommit(ref DefaultDatabase, isMainStore, version, diskless);
         }
 
         public override GarnetDatabase[] GetDatabasesSnapshot() => [DefaultDatabase];

diff --git a/libs/server/StoreWrapper.cs b/libs/server/StoreWrapper.cs
@@ -325,9 +325,9 @@ public void RecoverCheckpoint(bool replicaRecover = false, bool recoverMainStore
         /// <param name="isMainStore"></param>
         /// <param name="version"></param>
         /// <param name="dbId"></param>
-        /// <param name="streaming"></param>
-        public void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool streaming = false) =>
-            this.databaseManager.EnqueueCommit(isMainStore, version, dbId, streaming);
+        /// <param name="diskless"></param>
+        public void EnqueueCommit(bool isMainStore, long version, int dbId = 0, bool diskless = false) =>
+            this.databaseManager.EnqueueCommit(isMainStore, version, dbId, diskless);
 
         /// <summary>
         /// Reset

diff --git a/test/Garnet.test.cluster/ClusterTestUtils.cs b/test/Garnet.test.cluster/ClusterTestUtils.cs
@@ -2761,8 +2761,14 @@ public int GetStoreCurrentVersion(int nodeIndex, bool isMainStore, ILogger logge
                     if (line.StartsWith('#'))
                         continue;
                     var field = line.Trim().Split(':');
+
+                    // Remove 'db0.' prefix
+                    var sepIdx = field[0].IndexOf('.');
+                    if (sepIdx == -1) 
+                        continue;
+                    var key = field[0].Substring(sepIdx + 1);
 
-                    if (!Enum.TryParse(field[0], ignoreCase: true, out StoreInfoItem type))
+                    if (!Enum.TryParse(key, ignoreCase: true, out StoreInfoItem type))
                         continue;
 
                     if (infoItems.Contains(type))