Merge branch 'dev' into badrishc/unlimited-epoch

Author: badrishc

benchmark/BDN.benchmark/Embedded/GarnetServerEmbedded.cs

@@ -72,17 +72,6 @@ public EmbeddedNetworkHandler CreateNetworkHandler(SslClientAuthenticationOption
                     {
                         IncrementConnectionsReceived();
                         handler.Start(tlsOptions, remoteEndpointName);
-
-                        // Spin until auth finishes
-                        while (!handler.IsAuthenticated(out var fault))
-                        {
-                            if (fault != null)
-                            {
-                                throw new Exception("Authentication failed", fault);
-                            }
-
-                            Thread.Sleep(1);
-                        }
                     }
                     catch (Exception ex)
                     {

benchmark/BDN.benchmark/Operations/RawStringOperations.cs

@@ -18,10 +18,10 @@ public unsafe class RawStringOperations : OperationsBase
         static ReadOnlySpan<byte> SETEX => "*4\r\n$5\r\nSETEX\r\n$1\r\nd\r\n$1\r\n9\r\n$1\r\nd\r\n"u8;
         Request setex;
 
-        static ReadOnlySpan<byte> SETNX => "*4\r\n$3\r\nSET\r\n$1\r\na\r\n$1\r\na\r\n$2\r\nNX\r\n"u8;
+        static ReadOnlySpan<byte> SETNX => "*4\r\n$3\r\nSET\r\n$1\r\na\r\n$1\r\na\r\n$2\r\nNX\r\n"u8;   // Becomes SETEXNX rather than SETNX
         Request setnx;
 
-        static ReadOnlySpan<byte> SETXX => "*4\r\n$3\r\nSET\r\n$1\r\na\r\n$1\r\na\r\n$2\r\nXX\r\n"u8;
+        static ReadOnlySpan<byte> SETXX => "*4\r\n$3\r\nSET\r\n$1\r\na\r\n$1\r\na\r\n$2\r\nXX\r\n"u8;   // Becomes SETEXXX rather than SETXX
         Request setxx;
 
         static ReadOnlySpan<byte> GETNF => "*2\r\n$3\r\nGET\r\n$1\r\nb\r\n"u8;

checkpoints/rangeindex/78f58cdcb2159a11e8e6b7e6f3f98d8d/data.bftree

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.201",
+    "version": "10.0.203",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

global.json

@@ -157,20 +157,6 @@ public unsafe void Connect(CancellationToken token = default)
                 networkSendThrottleMax: networkSendThrottleMax,
                 logger: logger);
             networkHandler.Start(sslOptions, EndPoint.ToString(), token);
-
-            // Spin until auth finishes or cancellation occurs
-            while (!networkHandler.IsAuthenticated(out var fault))
-            {
-                if (fault != null)
-                {
-                    throw new Exception("Authentication failed", fault);
-                }
-
-                token.ThrowIfCancellationRequested();
-
-                Thread.Sleep(1);
-            }
-
             networkSender = networkHandler.GetNetworkSender();
             networkSender.GetResponseObject();
             offset = networkSender.GetResponseObjectHead();

libs/client/ClientSession/GarnetClientSession.cs

@@ -213,19 +213,6 @@ public void Connect(CancellationToken token = default)
             networkWriter = new NetworkWriter(this, socket, bufferSize, sslOptions, out networkHandler, sendPageSize, networkSendThrottleMax, epoch, PoolOwnerType.GarnetClient, logger);
             networkHandler.Start(sslOptions, EndPoint.ToString(), token);
 
-            // Spin until auth finishes or cancellation occurs
-            while (!networkHandler.IsAuthenticated(out var fault))
-            {
-                if (fault != null)
-                {
-                    throw new Exception("Authentication failed", fault);
-                }
-
-                token.ThrowIfCancellationRequested();
-
-                Thread.Sleep(1);
-            }
-
             if (timeoutMilliseconds > 0)
             {
                 Task.Run(TimeoutChecker);

libs/client/GarnetClient.cs

@@ -172,7 +172,7 @@ public void AddNewCheckpointEntry(bool full, AofAddress CheckpointCoveredAofAddr
         }
 
         /// <inheritdoc />
-        public void SafeTruncateAOF(AofAddress truncateUntil)
+        public void SafeTruncateAOF(in AofAddress truncateUntil)
         {
             if (clusterManager.CurrentConfig.LocalNodeRole == NodeRole.PRIMARY)
                 replicationManager.AofSyncDriverStore.SafeTruncateAof(truncateUntil);

libs/cluster/Server/ClusterProvider.cs

@@ -165,7 +165,7 @@ byte[] GetMostRecentConfig()
                 if (clusterProvider.replicationManager != null)
                     // NOTE: We update replication offset for sublog-0 because this info is used in CLUSTER NODES
                     // and we cannot have multiple replication offsets without changing the expected CLUSTER NODES response
-                    lastConfig.LazyUpdateLocalReplicationOffset(clusterProvider.replicationManager.ReplicationOffset[0]);
+                    lastConfig.LazyUpdateLocalReplicationOffset(clusterProvider.replicationManager.GetReplicationOffset(0));
                 byteArray = lastConfig.ToByteArray();
             }
             else

libs/cluster/Server/Gossip/GarnetServerNode.cs

@@ -15,26 +15,23 @@ enum CheckpointFileType : byte
         /// <summary>
         /// Store Hybrid LOG - Main
         /// </summary>
-        STORE_HLOG,
+        STORE_HLOG = 1,
         /// <summary>
         /// Store Hybrid LOG - Object
         /// </summary>
-        STORE_HLOG_OBJ,
-        /// <summary>
-        /// Store Delta Log
-        /// </summary>
-        STORE_DLOG,
+        STORE_HLOG_OBJ = 2,
+        // Value 3 reserved (was STORE_DLOG, removed with incremental snapshots)
         /// <summary>
         /// Store Index
         /// </summary>
-        STORE_INDEX,
+        STORE_INDEX = 4,
         /// <summary>
         /// Store Snapshot - Main
         /// </summary>
-        STORE_SNAPSHOT,
+        STORE_SNAPSHOT = 5,
         /// <summary>
         /// Store Snapshot - Object
         /// </summary>
-        STORE_SNAPSHOT_OBJ,
+        STORE_SNAPSHOT_OBJ = 6,
     }
 }

libs/cluster/Server/Replication/CheckpointFileType.cs

@@ -7,7 +7,6 @@
 using Garnet.common;
 using Garnet.server;
 using Microsoft.Extensions.Logging;
-using Tsavorite.core;
 
 namespace Garnet.cluster
 {
@@ -278,23 +277,8 @@ void GetCheckpointCookieMetadata(StoreType storeType, Guid fileToken, ref AofAdd
                 RecoveredReplicationId = null;
                 if (fileToken == default) return;
                 var ckptManager = clusterProvider.ReplicationLogCheckpointManager;
-                var pageSizeBits = clusterProvider.serverOptions.PageSizeBits();
 
-                using (var deltaFileDevice = ckptManager.GetDeltaLogDevice(fileToken))
-                {
-                    if (deltaFileDevice is not null)
-                    {
-                        deltaFileDevice.Initialize(-1);
-                        if (deltaFileDevice.GetFileSize(0) > 0)
-                        {
-                            var deltaLog = new DeltaLog(deltaFileDevice, pageSizeBits, -1);
-                            deltaLog.InitializeForReads();
-                            ckptManager.GetCheckpointCookieMetadata(fileToken, deltaLog, true, -1, ref recoveredSafeAofAddress, out RecoveredReplicationId);
-                            return;
-                        }
-                    }
-                }
-                ckptManager.GetCheckpointCookieMetadata(fileToken, null, false, -1, ref recoveredSafeAofAddress, out RecoveredReplicationId);
+                ckptManager.GetCheckpointCookieMetadata(fileToken, ref recoveredSafeAofAddress, out RecoveredReplicationId);
             }
         }