status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tune getLowSubnets (#3241) 

* Tune getLowSubnets

* Also aim for dHigh peers in gossipsub

* Apply suggestions from code review

Co-authored-by: Jacek Sieka <jacek@status.im>

Co-authored-by: Jacek Sieka <jacek@status.im>
This commit is contained in:
Tanguy 2022-01-04 14:37:04 +01:00 committed by GitHub
parent b81c06edab
commit 511f2d24f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
beacon_chain/networking/eth2_network.nim
View File

@ -1034,41 +1034,48 @@ proc trimConnections(node: Eth2Node, count: int) {.async.} =
proc getLowSubnets(node: Eth2Node, epoch: Epoch): (AttnetBits, SyncnetBits) = proc getLowSubnets(node: Eth2Node, epoch: Epoch): (AttnetBits, SyncnetBits) =
# Returns the subnets required to have a healthy mesh # Returns the subnets required to have a healthy mesh
# The subnets are computed, to, in order: # The subnets are computed, to, in order:
# - Have 0 subnet with < `dLow` peers from topic subscription
# - Have 0 subscribed subnet below `dLow` # - Have 0 subscribed subnet below `dLow`
# - Have 0 subnet with < `d` peers from topic subscription
# - Have 0 subscribed subnet below `dOut` outgoing peers # - Have 0 subscribed subnet below `dOut` outgoing peers
# - Have 0 subnet with < `dHigh` peers from topic subscription
template findLowSubnets(topicNameGenerator: untyped, template findLowSubnets(topicNameGenerator: untyped,
SubnetIdType: type, SubnetIdType: type,
totalSubnets: static int): auto = totalSubnets: static int): auto =
var var
lowOutgoingSubnets: BitArray[totalSubnets] lowOutgoingSubnets: BitArray[totalSubnets]
belowDLowSubnets: BitArray[totalSubnets] notHighOutgoingSubnets: BitArray[totalSubnets]
belowDSubnets: BitArray[totalSubnets]
belowDOutSubnets: BitArray[totalSubnets] belowDOutSubnets: BitArray[totalSubnets]
for subNetId in 0 ..< totalSubnets: for subNetId in 0 ..< totalSubnets:
let topic = let topic =
topicNameGenerator(node.forkId.forkDigest, SubnetIdType(subNetId)) topicNameGenerator(node.forkId.forkDigest, SubnetIdType(subNetId))
if node.pubsub.gossipsub.peers(topic) < node.pubsub.parameters.d: if node.pubsub.gossipsub.peers(topic) < node.pubsub.parameters.dLow:
lowOutgoingSubnets.setBit(subNetId) lowOutgoingSubnets.setBit(subNetId)
if node.pubsub.gossipsub.peers(topic) < node.pubsub.parameters.dHigh:
notHighOutgoingSubnets.setBit(subNetId)
# Not subscribed # Not subscribed
if topic notin node.pubsub.mesh: continue if topic notin node.pubsub.mesh: continue
if node.pubsub.mesh.peers(topic) < node.pubsub.parameters.dLow: if node.pubsub.mesh.peers(topic) < node.pubsub.parameters.dLow:
belowDlowSubnets.setBit(subNetId) belowDSubnets.setBit(subNetId)
let outPeers = node.pubsub.mesh.getOrDefault(topic).countIt(it.outbound) let outPeers = node.pubsub.mesh.getOrDefault(topic).countIt(it.outbound)
if outPeers < node.pubsub.parameters.dOut: if outPeers < node.pubsub.parameters.dOut:
belowDOutSubnets.setBit(subNetId) belowDOutSubnets.setBit(subNetId)
if belowDLowSubnets.countOnes() > 0: if lowOutgoingSubnets.countOnes() > 0:
belowDLowSubnets
elif lowOutgoingSubnets.countOnes() > 0:
lowOutgoingSubnets lowOutgoingSubnets
else: elif belowDSubnets.countOnes() > 0:
belowDSubnets
elif belowDOutSubnets.countOnes() > 0:
belowDOutSubnets belowDOutSubnets
else:
notHighOutgoingSubnets
return ( return (
findLowSubnets(getAttestationTopic, SubnetId, ATTESTATION_SUBNET_COUNT), findLowSubnets(getAttestationTopic, SubnetId, ATTESTATION_SUBNET_COUNT),