Avoid overlapped per-endpoint heartbeats and heartbeat error reports;…

… we don't want them backing up
wdqzdd · Feb 3, 2017 · 09f9d8a · 09f9d8a
1 parent d881e28
commit 09f9d8a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/StackExchange.Redis/StackExchange/Redis/ConnectionMultiplexer.cs b/StackExchange.Redis/StackExchange/Redis/ConnectionMultiplexer.cs
@@ -970,6 +970,8 @@ private ConnectionMultiplexer(ConfigurationOptions configuration)
         {
             ((ConnectionMultiplexer)state).OnHeartbeat();
         };
+
+        private int _activeHeartbeatErrors;
         private void OnHeartbeat()
         {
             try
@@ -982,9 +984,20 @@ private void OnHeartbeat()
                 var tmp = serverSnapshot;
                 for (int i = 0; i < tmp.Length; i++)
                     tmp[i].OnHeartbeat();
-            } catch(Exception ex)
+            }
+            catch (Exception ex)
             {
-                OnInternalError(ex);
+                if (Interlocked.CompareExchange(ref _activeHeartbeatErrors, 1, 0) == 0)
+                {
+                    try
+                    {
+                        OnInternalError(ex);
+                    }
+                    finally
+                    {
+                        Interlocked.Exchange(ref _activeHeartbeatErrors, 0);
+                    }
+                }
             }
         }
 

diff --git a/StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs b/StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace StackExchange.Redis
@@ -531,17 +532,28 @@ internal bool CheckInfoReplication()
         }
         private int lastInfoReplicationCheckTicks;
 
+        private int _heartBeatActive;
         internal void OnHeartbeat()
         {
-            try
-            {
-                interactive?.OnHeartbeat(false);
-                subscription?.OnHeartbeat(false);
-            } catch(Exception ex)
+            // don't overlap operations on an endpoint
+            if (Interlocked.CompareExchange(ref _heartBeatActive, 1, 0) == 0)
             {
-                multiplexer.OnInternalError(ex, EndPoint);
-            }
+                try
+                {
+
 
+                    interactive?.OnHeartbeat(false);
+                    subscription?.OnHeartbeat(false);
+                }
+                catch (Exception ex)
+                {
+                    multiplexer.OnInternalError(ex, EndPoint);
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref _heartBeatActive, 0);
+                }
+            }
         }
 
         internal Task<T> QueueDirectAsync<T>(Message message, ResultProcessor<T> processor, object asyncState = null, PhysicalBridge bridge = null)