@ -14,8 +14,16 @@
* /
package org.hyperledger.besu.ethereum.eth.manager ;
import org.hyperledger.besu.ethereum.core.BlockHeader ;
import org.hyperledger.besu.ethereum.eth.SnapProtocol ;
import org.hyperledger.besu.ethereum.eth.manager.EthPeer.DisconnectCallback ;
import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator ;
import org.hyperledger.besu.ethereum.eth.sync.ChainHeadTracker ;
import org.hyperledger.besu.ethereum.eth.sync.SnapServerChecker ;
import org.hyperledger.besu.ethereum.eth.sync.SyncMode ;
import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements ;
import org.hyperledger.besu.ethereum.forkid.ForkId ;
import org.hyperledger.besu.ethereum.forkid.ForkIdManager ;
import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec ;
import org.hyperledger.besu.ethereum.p2p.peers.Peer ;
import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent ;
@ -35,8 +43,10 @@ import java.util.Iterator;
import java.util.List ;
import java.util.Map ;
import java.util.Optional ;
import java.util.concurrent.CompletableFuture ;
import java.util.concurrent.ConcurrentHashMap ;
import java.util.concurrent.CopyOnWriteArrayList ;
import java.util.concurrent.TimeUnit ;
import java.util.function.Predicate ;
import java.util.function.Supplier ;
import java.util.stream.Collectors ;
@ -72,7 +82,7 @@ public class EthPeers {
public static final int NODE_ID_LENGTH = 64 ;
public static final int USEFULL_PEER_SCORE_THRESHOLD = 102 ;
private final Map < Bytes , EthPeer > comple teConnections = new ConcurrentHashMap < > ( ) ;
private final Map < Bytes , EthPeer > a ctiv eConnections= new ConcurrentHashMap < > ( ) ;
private final Cache < PeerConnection , EthPeer > incompleteConnections =
CacheBuilder . newBuilder ( )
@ -92,12 +102,22 @@ public class EthPeers {
private final Boolean randomPeerPriority ;
private final Bytes nodeIdMask = Bytes . random ( NODE_ID_LENGTH ) ;
private final Supplier < ProtocolSpec > currentProtocolSpecSupplier ;
private final SyncMode syncMode ;
private final ForkIdManager forkIdManager ;
private final int snapServerTargetNumber ;
private final boolean shouldLimitRemoteConnections ;
private Comparator < EthPeer > bestPeerComparator ;
private final Bytes localNodeId ;
private RlpxAgent rlpxAgent ;
private final Counter connectedPeersCounter ;
// private List<ProtocolManager> protocolManagers;
private ChainHeadTracker tracker ;
private SnapServerChecker snapServerChecker ;
private boolean snapServerPeersNeeded = false ;
private Supplier < TrailingPeerRequirements > trailingPeerRequirementsSupplier =
( ) - > TrailingPeerRequirements . UNRESTRICTED ;
public EthPeers (
final String protocolName ,
@ -109,7 +129,9 @@ public class EthPeers {
final Bytes localNodeId ,
final int peerUpperBound ,
final int maxRemotelyInitiatedConnections ,
final Boolean randomPeerPriority ) {
final Boolean randomPeerPriority ,
final SyncMode syncMode ,
final ForkIdManager forkIdManager ) {
this . protocolName = protocolName ;
this . currentProtocolSpecSupplier = currentProtocolSpecSupplier ;
this . clock = clock ;
@ -121,11 +143,22 @@ public class EthPeers {
this . maxRemotelyInitiatedConnections = maxRemotelyInitiatedConnections ;
this . randomPeerPriority = randomPeerPriority ;
LOG . trace ( "MaxPeers: {}, Max Remote: {}" , peerUpperBound , maxRemotelyInitiatedConnections ) ;
this . syncMode = syncMode ;
this . forkIdManager = forkIdManager ;
this . snapServerTargetNumber =
peerUpperBound / 2 ; // 50% of peers should be snap servers while snap syncing
this . shouldLimitRemoteConnections = maxRemotelyInitiatedConnections < peerUpperBound ;
metricsSystem . createIntegerGauge (
BesuMetricCategory . ETHEREUM ,
"peer_count" ,
"The current number of peers connected" ,
( ) - > ( int ) streamAvailablePeers ( ) . filter ( p - > p . readyForRequests ( ) ) . count ( ) ) ;
activeConnections : : size ) ;
metricsSystem . createIntegerGauge (
BesuMetricCategory . ETHEREUM ,
"peer_count_snap_server" ,
"The current number of peers connected that serve snap data" ,
( ) - > ( int ) streamAvailablePeers ( ) . filter ( EthPeer : : isServingSnap ) . count ( ) ) ;
metricsSystem . createIntegerGauge (
BesuMetricCategory . PEERS ,
"pending_peer_requests_current" ,
@ -146,7 +179,7 @@ public class EthPeers {
final PeerConnection newConnection , final List < PeerValidator > peerValidators ) {
final Bytes id = newConnection . getPeer ( ) . getId ( ) ;
synchronized ( this ) {
EthPeer ethPeer = comple teConnections . get ( id ) ;
EthPeer ethPeer = a ctiv eConnections. get ( id ) ;
if ( ethPeer = = null ) {
final Optional < EthPeer > peerInList =
incompleteConnections . asMap ( ) . values ( ) . stream ( )
@ -193,12 +226,12 @@ public class EthPeers {
if ( peer . getConnection ( ) . equals ( connection ) ) {
final Bytes id = peer . getId ( ) ;
if ( ! peerHasIncompleteConnection ( id ) ) {
removed = comple teConnections . remove ( id , peer ) ;
removed = a ctiv eConnections. remove ( id , peer ) ;
disconnectCallbacks . forEach ( callback - > callback . onDisconnect ( peer ) ) ;
peer . handleDisconnect ( ) ;
abortPendingRequestsAssignedToDisconnectedPeers ( ) ;
if ( peer . getReputation ( ) . getScore ( ) > USEFULL_PEER_SCORE_THRESHOLD ) {
LOG . atDebug ( ) . setMessage ( "Disconnected USEFULL peer {}" ) . addArgument ( peer ) . log ( ) ;
LOG . atDebug ( ) . setMessage ( "Disconnected USEFUL peer {}" ) . addArgument ( peer ) . log ( ) ;
} else {
LOG . atDebug ( )
. setMessage ( "Disconnected EthPeer {}" )
@ -227,7 +260,7 @@ public class EthPeers {
public EthPeer peer ( final PeerConnection connection ) {
final EthPeer ethPeer = incompleteConnections . getIfPresent ( connection ) ;
return ethPeer ! = null ? ethPeer : comple teConnections . get ( connection . getPeer ( ) . getId ( ) ) ;
return ethPeer ! = null ? ethPeer : a ctiv eConnections. get ( connection . getPeer ( ) . getId ( ) ) ;
}
public PendingPeerRequest executePeerRequest (
@ -265,7 +298,7 @@ public class EthPeers {
@VisibleForTesting
void reattemptPendingPeerRequests ( ) {
synchronized ( this ) {
final List < EthPeer > peers = streamAvailablePeers ( ) . collect ( Collectors . toList ( ) ) ;
final List < EthPeer > peers = streamAvailablePeers ( ) . toList ( ) ;
final Iterator < PendingPeerRequest > iterator = pendingRequests . iterator ( ) ;
while ( iterator . hasNext ( ) & & peers . stream ( ) . anyMatch ( EthPeer : : hasAvailableRequestCapacity ) ) {
final PendingPeerRequest request = iterator . next ( ) ;
@ -290,7 +323,7 @@ public class EthPeers {
public int peerCount ( ) {
removeDisconnectedPeers ( ) ;
return comple teConnections . size ( ) ;
return a ctiv eConnections. size ( ) ;
}
public int getMaxPeers ( ) {
@ -298,11 +331,11 @@ public class EthPeers {
}
public Stream < EthPeer > streamAllPeers ( ) {
return comple teConnections . values ( ) . stream ( ) ;
return a ctiv eConnections. values ( ) . stream ( ) ;
}
private void removeDisconnectedPeers ( ) {
comple teConnections
a ctiv eConnections
. values ( )
. forEach (
ep - > {
@ -313,9 +346,7 @@ public class EthPeers {
}
public Stream < EthPeer > streamAvailablePeers ( ) {
return streamAllPeers ( )
. filter ( EthPeer : : readyForRequests )
. filter ( peer - > ! peer . isDisconnected ( ) ) ;
return streamAllPeers ( ) . filter ( peer - > ! peer . isDisconnected ( ) ) ;
}
public Stream < EthPeer > streamBestPeers ( ) {
@ -350,53 +381,59 @@ public class EthPeers {
this . rlpxAgent = rlpxAgent ;
}
public Stream < PeerConnection > get AllActiveConnections( ) {
return comple teConnections . values ( ) . stream ( )
public Stream < PeerConnection > stream AllActiveConnections( ) {
return a ctiv eConnections. values ( ) . stream ( )
. map ( EthPeer : : getConnection )
. filter ( c - > ! c . isDisconnected ( ) ) ;
}
public Stream < PeerConnection > get AllConnections( ) {
public Stream < PeerConnection > stream AllConnections( ) {
return Stream . concat (
comple teConnections . values ( ) . stream ( ) . map ( EthPeer : : getConnection ) ,
a ctiv eConnections. values ( ) . stream ( ) . map ( EthPeer : : getConnection ) ,
incompleteConnections . asMap ( ) . keySet ( ) . stream ( ) )
. distinct ( )
. filter ( c - > ! c . isDisconnected ( ) ) ;
}
public boolean shouldConnect ( final Peer peer , final boolean inbound ) {
final Bytes id = peer . getId ( ) ;
if ( peerCount ( ) > = peerUpperBound & & ! canExceedPeerLimits ( id ) ) {
LOG . atTrace ( )
. setMessage ( "not connecting to peer {} - too many peers" )
. addArgument ( peer . getLoggableId ( ) )
public boolean shouldTryToConnect ( final Peer peer , final boolean inbound ) {
if ( peer . getForkId ( ) . isPresent ( ) ) {
final ForkId forkId = peer . getForkId ( ) . get ( ) ;
if ( ! forkIdManager . peerCheck ( forkId ) ) {
LOG . atDebug ( )
. setMessage ( "Wrong fork id, not trying to connect to peer {}" )
. addArgument ( peer : : getId )
. log ( ) ;
return false ;
}
final EthPeer ethPeer = completeConnections . get ( id ) ;
if ( ethPeer ! = null & & ! ethPeer . isDisconnected ( ) ) {
LOG . atTrace ( )
. setMessage ( "not connecting to peer {} - already disconnected" )
. addArgument ( ethPeer . getLoggableId ( ) )
. log ( ) ;
return false ;
}
final List < PeerConnection > incompleteConnections = getIncompleteConnections ( id ) ;
if ( ! incompleteConnections . isEmpty ( ) ) {
if ( incompleteConnections . stream ( )
. anyMatch ( c - > ! c . isDisconnected ( ) & & ( ! inbound | | ( inbound & & c . inboundInitiated ( ) ) ) ) ) {
final Bytes id = peer . getId ( ) ;
if ( alreadyConnectedOrConnecting ( inbound , id ) ) {
LOG . atTrace ( )
. setMessage ( "not connecting to peer {} - new connection already in process " )
. setMessage ( "not connecting to peer {} - already connected" )
. addArgument ( peer . getLoggableId ( ) )
. log ( ) ;
return false ;
}
return peerCount ( ) < getMaxPeers ( ) | | needMoreSnapServers ( ) | | canExceedPeerLimits ( id ) ;
}
private boolean alreadyConnectedOrConnecting ( final boolean inbound , final Bytes id ) {
final EthPeer ethPeer = activeConnections . get ( id ) ;
if ( ethPeer ! = null & & ! ethPeer . isDisconnected ( ) ) {
return true ;
}
final List < PeerConnection > incompleteConnections = getIncompleteConnections ( id ) ;
return incompleteConnections . stream ( )
. anyMatch ( c - > ! c . isDisconnected ( ) & & ( ! inbound | | ( inbound & & c . inboundInitiated ( ) ) ) ) ;
}
public void disconnectWorstUselessPeer ( ) {
streamAvailablePeers ( )
. filter ( p - > ! canExceedPeerLimits ( p . getId ( ) ) )
. min ( getBestPeerComparator ( ) )
. ifPresent (
peer - > {
@ -411,6 +448,23 @@ public class EthPeers {
} ) ;
}
public void setChainHeadTracker ( final ChainHeadTracker tracker ) {
this . tracker = tracker ;
}
public void setSnapServerChecker ( final SnapServerChecker checker ) {
this . snapServerChecker = checker ;
}
public void snapServerPeersNeeded ( final boolean b ) {
this . snapServerPeersNeeded = b ;
}
public void setTrailingPeerRequirementsSupplier (
final Supplier < TrailingPeerRequirements > tprSupplier ) {
this . trailingPeerRequirementsSupplier = tprSupplier ;
}
@FunctionalInterface
public interface ConnectCallback {
void onPeerConnected ( EthPeer newPeer ) ;
@ -418,22 +472,109 @@ public class EthPeers {
@Override
public String toString ( ) {
if ( comple teConnections . isEmpty ( ) ) {
if ( a ctiv eConnections. isEmpty ( ) ) {
return "0 EthPeers {}" ;
}
final String connectionsList =
comple teConnections . values ( ) . stream ( )
a ctiv eConnections. values ( ) . stream ( )
. sorted ( )
. map ( EthPeer : : toString )
. collect ( Collectors . joining ( ", \n" ) ) ;
return comple teConnections . size ( ) + " EthPeers {\n" + connectionsList + '}' ;
return a ctiv eConnections. size ( ) + " EthPeers {\n" + connectionsList + '}' ;
}
private void ethPeerStatusExchanged ( final EthPeer peer ) {
if ( addPeerToEthPeers ( peer ) ) {
// We have a connection to a peer that is on the right chain and is willing to connect to us.
// Find out what the EthPeer block height is and whether it can serve snap data (if we are doing
// snap sync)
LOG . debug ( "Peer {} status exchanged" , peer ) ;
assert tracker ! = null : "ChainHeadTracker must be set before EthPeers can be used" ;
CompletableFuture < BlockHeader > future = tracker . getBestHeaderFromPeer ( peer ) ;
future . whenComplete (
( peerHeadBlockHeader , error ) - > {
if ( peerHeadBlockHeader = = null ) {
LOG . debug (
"Failed to retrieve chain head info. Disconnecting {}... {}" ,
peer . getLoggableId ( ) ,
error ) ;
peer . disconnect (
DisconnectMessage . DisconnectReason . USELESS_PEER_FAILED_TO_RETRIEVE_CHAIN_HEAD ) ;
} else {
// we can check trailing peers now
final TrailingPeerRequirements trailingPeerRequirements =
trailingPeerRequirementsSupplier . get ( ) ;
if ( trailingPeerRequirements ! = null ) {
if ( peer . chainState ( ) . getEstimatedHeight ( )
< trailingPeerRequirements . getMinimumHeightToBeUpToDate ( ) ) {
if ( ! ( getNumTrailingPeers ( trailingPeerRequirements . getMinimumHeightToBeUpToDate ( ) )
< trailingPeerRequirements . getMaxTrailingPeers ( ) ) ) {
LOG . atTrace ( )
. setMessage (
"Adding trailing peer {} would exceed max trailing peers {}. Disconnecting..." )
. addArgument ( peer . getLoggableId ( ) )
. addArgument ( trailingPeerRequirements . getMaxTrailingPeers ( ) )
. log ( ) ;
peer . disconnect (
DisconnectMessage . DisconnectReason . USELESS_PEER_EXCEEDS_TRAILING_PEERS ) ;
return ;
}
}
}
peer . chainState ( ) . updateHeightEstimate ( peerHeadBlockHeader . getNumber ( ) ) ;
CompletableFuture < Void > isServingSnapFuture ;
if ( SyncMode . isCheckpointSync ( syncMode ) | | SyncMode . isSnapSync ( syncMode ) ) {
// even if we have finished the snap sync, we still want to know if the peer is a snap
// server
isServingSnapFuture =
CompletableFuture . runAsync (
( ) - > {
try {
checkIsSnapServer ( peer , peerHeadBlockHeader ) ;
} catch ( Exception e ) {
throw new RuntimeException ( e ) ;
}
} ) ;
} else {
isServingSnapFuture = CompletableFuture . completedFuture ( null ) ;
}
isServingSnapFuture . thenRun (
( ) - > {
if ( ! peer . getConnection ( ) . isDisconnected ( ) & & addPeerToEthPeers ( peer ) ) {
connectedPeersCounter . inc ( ) ;
connectCallbacks . forEach ( cb - > cb . onPeerConnected ( peer ) ) ;
}
} ) ;
}
} ) ;
}
private void checkIsSnapServer ( final EthPeer peer , final BlockHeader peersHeadBlockHeader ) {
if ( peer . getAgreedCapabilities ( ) . contains ( SnapProtocol . SNAP1 ) ) {
if ( snapServerChecker ! = null ) {
// set that peer is a snap server for doing the test
peer . setIsServingSnap ( true ) ;
Boolean isServer ;
try {
isServer = snapServerChecker . check ( peer , peersHeadBlockHeader ) . get ( 6L , TimeUnit . SECONDS ) ;
} catch ( Exception e ) {
LOG . atTrace ( )
. setMessage ( "Error checking if peer {} is a snap server. Setting to false." )
. addArgument ( peer . getLoggableId ( ) )
. log ( ) ;
peer . setIsServingSnap ( false ) ;
return ;
}
peer . setIsServingSnap ( isServer ) ;
LOG . atTrace ( )
. setMessage ( "{}: peer {}" )
. addArgument ( isServer ? "Is a snap server" : "Is NOT a snap server" )
. addArgument ( peer . getLoggableId ( ) )
. log ( ) ;
}
}
}
private int comparePeerPriorities ( final EthPeer p1 , final EthPeer p2 ) {
@ -468,7 +609,7 @@ public class EthPeers {
}
private void enforceRemoteConnectionLimits ( ) {
if ( ! shouldLimitRemoteConnections ( ) | | peerCount ( ) < maxRemotelyInitiatedConnections ) {
if ( ! shouldLimitRemoteConnections | | peerCount ( ) < maxRemotelyInitiatedConnections ) {
// Nothing to do
return ;
}
@ -488,7 +629,7 @@ public class EthPeers {
}
private Stream < EthPeer > getActivePrioritizedPeers ( ) {
return comple teConnections . values ( ) . stream ( )
return a ctiv eConnections. values ( ) . stream ( )
. filter ( p - > ! p . isDisconnected ( ) )
. sorted ( this : : comparePeerPriorities ) ;
}
@ -512,19 +653,15 @@ public class EthPeers {
} ) ;
}
private boolean remoteConnectionLimitReached ( ) {
return shouldLimitRemoteConnections ( )
& & countUntrustedRemotelyInitiatedConnections ( ) > = maxRemotelyInitiatedConnections ;
}
private boolean shouldLimitRemoteConnections ( ) {
return maxRemotelyInitiatedConnections < peerUpperBound ;
private boolean inboundInitiatedConnectionLimitExceeded ( ) {
return shouldLimitRemoteConnections
& & countUntrustedRemotelyInitiatedConnections ( ) > maxRemotelyInitiatedConnections ;
}
private long countUntrustedRemotelyInitiatedConnections ( ) {
return comple teConnections . values ( ) . stream ( )
. map ( ep - > ep . getConnection ( ) )
. filter ( c - > c . inboundInitiated ( ) )
return activeConnections . values ( ) . stream ( )
. map ( EthPeer : : getConnection )
. filter ( PeerConnection : : inboundInitiated )
. filter ( c - > ! c . isDisconnected ( ) )
. filter ( conn - > ! canExceedPeerLimits ( conn . getPeer ( ) . getId ( ) ) )
. count ( ) ;
@ -534,67 +671,123 @@ public class EthPeers {
final RemovalNotification < PeerConnection , EthPeer > removalNotification ) {
if ( removalNotification . wasEvicted ( ) ) {
final PeerConnection peerConnectionRemoved = removalNotification . getKey ( ) ;
final PeerConnection peerConnectionOfEthPeer = removalNotification . getValue ( ) . getConnection ( ) ;
final EthPeer peer = removalNotification . getValue ( ) ;
if ( peer = = null ) {
return ;
}
final PeerConnection peerConnectionOfEthPeer = peer . getConnection ( ) ;
if ( peerConnectionRemoved ! = null ) {
if ( ! peerConnectionRemoved . equals ( peerConnectionOfEthPeer ) ) {
// If this connection is not the connection of the EthPeer by now we can disconnect
peerConnectionRemoved . disconnect ( DisconnectMessage . DisconnectReason . ALREADY_CONNECTED ) ;
}
}
}
}
private boolean addPeerToEthPeers ( final EthPeer peer ) {
boolean addPeerToEthPeers ( final EthPeer peer ) {
// We have a connection to a peer that is on the right chain and is willing to connect to us.
// Figure out whether we want to keep this peer and add it to the EthPeers connections.
if ( completeConnections . containsValue ( peer ) ) {
// Figure out whether we want to add it to the active connections.
final PeerConnection connection = peer . getConnection ( ) ;
if ( activeConnections . containsValue ( peer ) ) {
return false ;
}
final PeerConnection connection = peer . getConnection ( ) ;
final Bytes id = peer . getId ( ) ;
if ( ! randomPeerPriority ) {
// Disconnect if too many peers
if ( ! canExceedPeerLimits ( id ) & & peerCount ( ) > = peerUpperBound ) {
if ( peerCount ( ) > = peerUpperBound ) {
final long numSnapServers = numberOfSnapServers ( ) ;
final boolean inboundLimitExceeded = inboundInitiatedConnectionLimitExceeded ( ) ;
// three reasons why we would disconnect an existing peer to accommodate the new peer
if ( canExceedPeerLimits ( id )
| | ( snapServerPeersNeeded
& & numSnapServers < snapServerTargetNumber
& & peer . isServingSnap ( ) )
| | ( inboundLimitExceeded & & ! peer . getConnection ( ) . inboundInitiated ( ) ) ) {
final boolean filterOutSnapServers =
snapServerPeersNeeded & & ( numSnapServers < = snapServerTargetNumber ) ;
// find and disconnect the least useful peer we can disconnect
activeConnections . values ( ) . stream ( )
. filter ( p - > ! canExceedPeerLimits ( p . getId ( ) ) )
. filter ( filterOutSnapServers ? p - > ! p . isServingSnap ( ) : p - > true )
. filter ( inboundLimitExceeded ? p - > p . getConnection ( ) . inboundInitiated ( ) : p - > true )
. min ( MOST_USEFUL_PEER )
. ifPresentOrElse (
pe - > {
pe . disconnect ( DisconnectMessage . DisconnectReason . TOO_MANY_PEERS ) ;
LOG . atTrace ( )
. setMessage ( "Too many peers. Disconnect connection: {}, max connections {}" )
. addArgument ( connection )
. addArgument ( peerUpperBound )
. setMessage ( "Disconnecting peer {} to be replaced by prioritised peer {}" )
. addArgument ( pe . getLoggableId ( ) )
. addArgument ( peer . getLoggableId ( ) )
. log ( ) ;
connection . disconnect ( DisconnectMessage . DisconnectReason . TOO_MANY_PEERS ) ;
return false ;
}
// Disconnect if too many remotely-initiated connections
if ( connection . inboundInitiated ( )
& & ! canExceedPeerLimits ( id )
& & remoteConnectionLimitReached ( ) ) {
} ,
( ) - > // disconnect the least useful peer
activeConnections . values ( ) . stream ( )
. filter ( p - > ! canExceedPeerLimits ( p . getId ( ) ) )
. min ( MOST_USEFUL_PEER )
. ifPresent (
p - > {
p . disconnect ( DisconnectMessage . DisconnectReason . TOO_MANY_PEERS ) ;
LOG . atTrace ( )
. setMessage (
"Too many remotely-initiated connections. Disconnect incoming connection: {}, maxRemote={}" )
"Disconnecting peer {} to be replaced by prioritised peer {}" )
. addArgument ( p . getLoggableId ( ) )
. addArgument ( peer . getLoggableId ( ) )
. log ( ) ;
} ) ) ;
} else {
LOG . atTrace ( )
. setMessage (
"Too many peers. Disconnect peer {} with connection: {}, max connections {}" )
. addArgument ( peer . getLoggableId ( ) )
. addArgument ( connection )
. addArgument ( maxRemotelyInitiatedConnections )
. addArgument ( peerUpperBound )
. log ( ) ;
connection . disconnect ( DisconnectMessage . DisconnectReason . TOO_MANY_PEERS ) ;
return false ;
}
final boolean added = ( completeConnections . putIfAbsent ( id , peer ) = = null ) ;
}
final boolean added = ( activeConnections . putIfAbsent ( id , peer ) = = null ) ;
if ( added ) {
LOG . atTrace ( )
. setMessage ( "Added peer {} with connection {} to comple teConnections" )
. setMessage ( "Added peer {} with connection {} to a ctiv eConnections" )
. addArgument ( id )
. addArgument ( connection )
. log ( ) ;
} else {
LOG . atTrace ( )
. setMessage ( "Did not add peer {} with connection {} to comple teConnections" )
. setMessage ( "Did not add peer {} with connection {} to a ctiv eConnections" )
. addArgument ( id )
. addArgument ( connection )
. log ( ) ;
}
return added ;
} else {
// randomPeerPriority! Add the peer and if there are too many connections fix it
completeConnections . putIfAbsent ( id , peer ) ;
// TODO: random peer priority does not care yet about snap server peers -> check later
activeConnections . putIfAbsent ( id , peer ) ;
enforceRemoteConnectionLimits ( ) ;
enforceConnectionLimits ( ) ;
return completeConnections . containsKey ( id ) ;
return activeConnections . containsKey ( id ) ;
}
}
private long getNumTrailingPeers ( final long minimumHeightToBeUpToDate ) {
return streamAvailablePeers ( )
. filter ( p - > p . chainState ( ) . getEstimatedHeight ( ) < minimumHeightToBeUpToDate )
. count ( ) ;
}
private boolean needMoreSnapServers ( ) {
return snapServerPeersNeeded & & numberOfSnapServers ( ) < snapServerTargetNumber ;
}
private long numberOfSnapServers ( ) {
return activeConnections . values ( ) . stream ( ) . filter ( EthPeer : : isServingSnap ) . count ( ) ;
}
}
Stefan Pingel
5 months ago
committed by
GitHub