mirror of https://github.com/waku-org/nwaku.git
fix(networkmanager): regularly disconnect from random peers (#2553)
This commit is contained in:
parent
e861317209
commit
70c53fc058
|
@ -4,7 +4,7 @@ else:
|
||||||
{.push raises: [].}
|
{.push raises: [].}
|
||||||
|
|
||||||
import
|
import
|
||||||
std/[tables, strutils, times, sequtils],
|
std/[tables, strutils, times, sequtils, random],
|
||||||
stew/results,
|
stew/results,
|
||||||
stew/shims/net,
|
stew/shims/net,
|
||||||
chronicles,
|
chronicles,
|
||||||
|
@ -27,6 +27,7 @@ import
|
||||||
../../waku/waku_enr,
|
../../waku/waku_enr,
|
||||||
../../waku/waku_discv5,
|
../../waku/waku_discv5,
|
||||||
../../waku/waku_dnsdisc,
|
../../waku/waku_dnsdisc,
|
||||||
|
../../waku/waku_relay,
|
||||||
../../waku/waku_rln_relay,
|
../../waku/waku_rln_relay,
|
||||||
../../waku/factory/builder,
|
../../waku/factory/builder,
|
||||||
../wakunode2/networks_config,
|
../wakunode2/networks_config,
|
||||||
|
@ -41,6 +42,7 @@ const ReconnectTime = 60
|
||||||
const MaxConnectionRetries = 5
|
const MaxConnectionRetries = 5
|
||||||
const ResetRetriesAfter = 1200
|
const ResetRetriesAfter = 1200
|
||||||
const AvgPingWindow = 10.0
|
const AvgPingWindow = 10.0
|
||||||
|
const MaxConnectedPeers = 150
|
||||||
|
|
||||||
const git_version* {.strdefine.} = "n/a"
|
const git_version* {.strdefine.} = "n/a"
|
||||||
|
|
||||||
|
@ -128,6 +130,16 @@ proc setConnectedPeersMetrics(
|
||||||
|
|
||||||
var analyzeFuts: seq[Future[Result[string, string]]]
|
var analyzeFuts: seq[Future[Result[string, string]]]
|
||||||
|
|
||||||
|
var (inConns, outConns) = node.peer_manager.connectedPeers(WakuRelayCodec)
|
||||||
|
info "connected peers", inConns=inConns.len, outConns=outConns.len
|
||||||
|
|
||||||
|
shuffle(outConns)
|
||||||
|
|
||||||
|
if outConns.len >= toInt(MaxConnectedPeers/2):
|
||||||
|
for p in outConns[0 ..< toInt(outConns.len/2)]:
|
||||||
|
trace "Pruning Peer", Peer = $p
|
||||||
|
asyncSpawn(node.switch.disconnect(p))
|
||||||
|
|
||||||
# iterate all newly discovered nodes
|
# iterate all newly discovered nodes
|
||||||
for discNode in discoveredNodes:
|
for discNode in discoveredNodes:
|
||||||
let typedRecord = discNode.record.toTypedRecord()
|
let typedRecord = discNode.record.toTypedRecord()
|
||||||
|
@ -429,7 +441,8 @@ proc initAndStartApp(
|
||||||
|
|
||||||
nodeBuilder.withNodeKey(key)
|
nodeBuilder.withNodeKey(key)
|
||||||
nodeBuilder.withRecord(record)
|
nodeBuilder.withRecord(record)
|
||||||
nodeBuilder.withPeerManagerConfig(maxRelayPeers = none(int), shardAware = true)
|
nodeBUilder.withSwitchConfiguration(maxConnections = some(MaxConnectedPeers))
|
||||||
|
nodeBuilder.withPeerManagerConfig(maxRelayPeers = some(20), shardAware = true)
|
||||||
let res = nodeBuilder.withNetworkConfigurationDetails(bindIp, nodeTcpPort)
|
let res = nodeBuilder.withNetworkConfigurationDetails(bindIp, nodeTcpPort)
|
||||||
if res.isErr():
|
if res.isErr():
|
||||||
return err("node building error" & $res.error)
|
return err("node building error" & $res.error)
|
||||||
|
|
Loading…
Reference in New Issue