Cancel setup outgoing peer connection if throttled

NethermindEth · Jun 21, 2023 · a0a17fe · a0a17fe
1 parent e9375c4
commit a0a17fe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Nethermind/Nethermind.Core.Test/RateLimiterTests.cs b/src/Nethermind/Nethermind.Core.Test/RateLimiterTests.cs
@@ -54,4 +54,12 @@ public async Task RateLimiter_should_throw_when_cancelled()
         Func<Task> act = async () => await waitTask;
         await act.Should().ThrowAsync<OperationCanceledException>();
     }
+
+    [Test]
+    public async Task RateLimiter_should_return_true_on_is_throttled_if_throttled()
+    {
+        RateLimiter rateLimiter = new(1);
+        await rateLimiter.WaitAsync(CancellationToken.None);
+        rateLimiter.IsThrottled().Should().BeTrue();
+    }
 }
diff --git a/src/Nethermind/Nethermind.Core/RateLimiter.cs b/src/Nethermind/Nethermind.Core/RateLimiter.cs
@@ -27,6 +27,11 @@ private RateLimiter(double intervalSec)
         _nextSlot = DateTimeOffset.Now;
     }
 
+    public bool IsThrottled()
+    {
+        return DateTimeOffset.Now < _nextSlot;
+    }
+
     public async Task WaitAsync(CancellationToken ctx)
     {
         while (true)

diff --git a/src/Nethermind/Nethermind.Network/PeerManager.cs b/src/Nethermind/Nethermind.Network/PeerManager.cs
@@ -122,7 +122,7 @@ private void PeerPoolOnPeerAdded(object sender, PeerEventArgs nodeEventArgs)
                     // fire and forget - all the surrounding logic will be executed
                     // exceptions can be lost here without issues
                     // this for rapid connections to newly discovered peers without having to go through the UpdatePeerLoop
-                    SetupOutgoingPeerConnection(peer);
+                    SetupOutgoingPeerConnection(peer, true);
                 }
 #pragma warning restore 4014
             }
@@ -606,8 +606,12 @@ public int Compare(PeerStats x, PeerStats y)
         #region Outgoing connection handling
 
         [Todo(Improve.MissingFunctionality, "Add cancellation support for the peer connection (so it does not wait for the 10sec timeout")]
-        private async Task SetupOutgoingPeerConnection(Peer peer)
+        private async Task SetupOutgoingPeerConnection(Peer peer, bool cancelIfThrottled = false)
         {
+            if (cancelIfThrottled)
+            {
+                if (_outgoingConnectionRateLimiter.IsThrottled()) return;
+            }
             await _outgoingConnectionRateLimiter.WaitAsync(_cancellationTokenSource.Token);
 
             // Can happen when In connection is received from the same peer and is initialized before we get here