Remove least active peer

qdrvm · Oct 18, 2024 · 4678b9b · 4678b9b
1 parent e77d0ac
commit 4678b9b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/core/network/impl/peer_manager_impl.cpp b/core/network/impl/peer_manager_impl.cpp
@@ -753,6 +753,21 @@ namespace kagome::network {
     }
   }
 
+  PeerId PeerManagerImpl::findLeastActivePeer() const {
+    if (active_peers_.empty()) {
+      return PeerId{};
+    }
+
+    auto it =
+        std::min_element(active_peers_.begin(),
+                         active_peers_.end(),
+                         [](const auto &l, const auto &r) {
+                           return l.second.time_point < r.second.time_point;
+                         });
+
+    return it->first;
+  }
+
   void PeerManagerImpl::tryOpenValidationProtocol(
       const PeerInfo &peer_info,
       PeerState &peer_state,
@@ -820,9 +835,17 @@ namespace kagome::network {
 
     if (not out) {
       if (countPeers(PeerType::PEER_TYPE_IN) >= app_config_.inPeers()) {
-        connecting_peers_.erase(peer_id);
-        disconnectFromPeer(peer_id);
-        return;
+        PeerId peer_to_remove = findLeastActivePeer();
+        if (peer_to_remove.empty()) {
+          SL_ERROR(log_,
+                   "New connection from peer {} was dropped: "
+                   "no peers to disconnect",
+                   peer_id);
+          connecting_peers_.erase(peer_id);
+          disconnectFromPeer(peer_id);
+          return;
+        }
+        connecting_peers_.erase(peer_to_remove);
       }
     }
 

diff --git a/core/network/impl/peer_manager_impl.hpp b/core/network/impl/peer_manager_impl.hpp
@@ -188,6 +188,8 @@ namespace kagome::network {
 
     void clearClosedPingingConnections();
 
+    PeerId findLeastActivePeer() const;
+
     using IsLight = Tagged<bool, struct IsLightTag>;
     size_t countPeers(PeerType in_out, IsLight in_light = false) const;