rename replay max lag parameter and added stats info

microsoft · Nov 13, 2024 · c216e21 · c216e21
1 parent f715ec4
commit c216e21
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/libs/cluster/Server/ClusterProvider.cs b/libs/cluster/Server/ClusterProvider.cs
@@ -231,6 +231,7 @@ public MetricsItem[] GetReplicationInfo()
                 {
                     var (address, port) = config.GetLocalNodePrimaryAddress();
                     var primaryLinkStatus = clusterManager.GetPrimaryLinkStatus(config);
+                    var replicationOffsetLag = storeWrapper.appendOnlyFile.TailAddress - replicationManager.ReplicationOffset;
                     replicationInfo.Add(new("master_host", address));
                     replicationInfo.Add(new("master_port", port.ToString()));
                     replicationInfo.Add(primaryLinkStatus[0]);
@@ -241,6 +242,8 @@ public MetricsItem[] GetReplicationInfo()
                     replicationInfo.Add(new("slave_read_only", "1"));
                     replicationInfo.Add(new("replica_announced", "1"));
                     replicationInfo.Add(new("master_sync_last_io_seconds_ago", replicationManager.LastPrimarySyncSeconds.ToString()));
+                    replicationInfo.Add(new("replication_offset_lag", replicationOffsetLag.ToString()));
+                    replicationInfo.Add(new("replication_offset_max_lag", storeWrapper.serverOptions.ReplicationOffsetMaxLag.ToString()));
                 }
                 else
                 {

diff --git a/libs/cluster/Server/Replication/ReplicaOps/ReplicationReplicaAofSync.cs b/libs/cluster/Server/Replication/ReplicaOps/ReplicationReplicaAofSync.cs
@@ -13,7 +13,7 @@ internal sealed partial class ReplicationManager : IDisposable
     {
         void ThrottlePrimary()
         {
-            while (replayIterator != null && storeWrapper.appendOnlyFile.TailAddress - ReplicationOffset > storeWrapper.serverOptions.ReplicaMaxLag)
+            while (replayIterator != null && storeWrapper.appendOnlyFile.TailAddress - ReplicationOffset > storeWrapper.serverOptions.ReplicationOffsetMaxLag)
             {
                 replicaReplayTaskCts.Token.ThrowIfCancellationRequested();
                 Thread.Yield();

diff --git a/libs/host/Configuration/Options.cs b/libs/host/Configuration/Options.cs
@@ -343,8 +343,8 @@ internal sealed class Options
         public int ReplicaSyncDelayMs { get; set; }
 
         [IntRangeValidation(-1, int.MaxValue)]
-        [Option("replica-max-lag", Required = false, HelpText = "Upper bound on the lag (i.e. throttle replicaAOF append if AOF.TailAddress - ReplicationOffset > ReplicaMaxLag) between primary and replica. -1 - Synchronous replay, >= 0 - background replay with specified lag")]
-        public int ReplicaMaxLag { get; set; }
+        [Option("replica-offset-max-lag", Required = false, HelpText = "Upper bound on the lag (i.e. throttle replicaAOF append if AOF.TailAddress - ReplicationOffset > ReplicaMaxLag) between primary and replica. -1 - Synchronous replay, >= 0 - background replay with specified lag")]
+        public int ReplicationOffsetMaxLag { get; set; }
 
         [OptionValidation]
         [Option("main-memory-replication", Required = false, HelpText = "Use main-memory replication model.")]
@@ -643,7 +643,7 @@ public GarnetServerOptions GetServerOptions(ILogger logger = null)
                 CheckpointThrottleFlushDelayMs = CheckpointThrottleFlushDelayMs,
                 EnableScatterGatherGet = EnableScatterGatherGet.GetValueOrDefault(),
                 ReplicaSyncDelayMs = ReplicaSyncDelayMs,
-                ReplicaMaxLag = ReplicaMaxLag,
+                ReplicationOffsetMaxLag = ReplicationOffsetMaxLag,
                 MainMemoryReplication = MainMemoryReplication.GetValueOrDefault(),
                 OnDemandCheckpoint = OnDemandCheckpoint.GetValueOrDefault(),
                 UseAofNullDevice = UseAofNullDevice.GetValueOrDefault(),

diff --git a/libs/host/defaults.conf b/libs/host/defaults.conf
@@ -255,7 +255,7 @@
 	"ReplicaSyncDelayMs" : 5,
 
 	/* Upper bound on the lag (i.e. throttle replicaAOF append if AOF.TailAddress - ReplicationOffset > ReplicaMaxLag) between primary and replica. -1 - Synchronous replay, >= 0 - background replay with specified lag*/
-	"ReplicaMaxLag" : 32768,
+	"ReplicationOffsetMaxLag" : -1,
 
 	/* Use main-memory replication model. */
 	"MainMemoryReplication" : false,

diff --git a/libs/server/Servers/GarnetServerOptions.cs b/libs/server/Servers/GarnetServerOptions.cs
@@ -287,7 +287,7 @@ public class GarnetServerOptions : ServerOptions
         /// <summary>
         /// Upper bound on the lag (i.e. throttle replicaAOF append if AOF.TailAddress - ReplicationOffset > ReplicaMaxLag) between primary and replica. -1 - Synchronous replay, >= 0 - background replay with specified lag 
         /// </summary>
-        public int ReplicaMaxLag = 32768;
+        public int ReplicationOffsetMaxLag = -1;
 
         /// <summary>
         /// Whether we truncate AOF as soon as replicas are fed (not just after checkpoints)
@@ -309,8 +309,6 @@ public class GarnetServerOptions : ServerOptions
         /// </summary>
         public bool UseNativeDeviceLinux = false;
 
-
-
         /// <summary>
         /// Limit of items to return in one iteration of *SCAN command
         /// </summary>