increase default max peers (#2106)

* increase default max peers

also avoid reconnection when opening stream as this might induce
a loop

* Use dial without addresses

* dial back max peers a little
This commit is contained in:
Jacek Sieka 2020-11-29 14:43:41 +01:00 committed by GitHub
parent b32c7c0851
commit c3bfe15a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -139,7 +139,7 @@ type
name: "udp-port" }: Port
maxPeers* {.
defaultValue: 79 # The Wall gets released
defaultValue: 160 # 5 (fanout) * 64 (subnets) / 2 (subs) for a heathy mesh
desc: "The maximum number of peers to connect to"
name: "max-peers" }: int

View File

@ -311,10 +311,13 @@ template remote*(peer: Peer): untyped =
proc openStream(node: Eth2Node,
peer: Peer,
protocolId: string): Future[Connection] {.async.} =
# When dialling here, we do not provide addresses - all new connection
# attempts are handled via `connect` which also takes into account
# reconnection timeouts
let
protocolId = protocolId & "ssz_snappy"
conn = await dial(
node.switch, peer.info.peerId, peer.info.addrs, protocolId)
node.switch, peer.info.peerId, protocolId)
# libp2p may replace peerinfo ref sometimes, so make sure we have a recent
# one
@ -665,7 +668,7 @@ proc handleIncomingStream(network: Eth2Node,
case peer.connectionState
of Disconnecting, Disconnected, None:
# We got incoming stream request while disconnected or disconnecting.
warn "Got incoming request from disconnected peer", peer = peer,
debug "Got incoming request from disconnected peer", peer = peer,
message = msgName
await conn.closeWithEOF()
return