status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-29 13:35:38 +00:00
Code Issues Projects Releases Wiki Activity

Fluffy State Bridge: Support skipping gossip when content is found in the network (#2867)

Browse Source
This commit is contained in:
bhartnett 2024-11-25 11:40:09 +08:00 committed by GitHub
parent e64e5c77b3
commit 78c5770b2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fluffy/tools/portal_bridge/portal_bridge_conf.nim
View File

@ -191,6 +191,13 @@ type
name: "verify-gossip" name: "verify-gossip"
.}: bool .}: bool
skipGossipForExisting* {.
desc:
"Enable skipping gossip of each content value which is successfully fetched from the network",
defaultValue: true,
name: "skip-gossip-for-existing"
.}: bool
gossipWorkersCount* {. gossipWorkersCount* {.
desc: desc:
"The number of workers to use for gossiping the state into the portal network", "The number of workers to use for gossiping the state into the portal network",

35
fluffy/tools/portal_bridge/portal_bridge_state.nim
View File

@ -263,6 +263,7 @@ proc runBackfillGossipBlockOffersLoop(
portalRpcUrl: JsonRpcUrl, portalRpcUrl: JsonRpcUrl,
portalNodeId: NodeId, portalNodeId: NodeId,
verifyGossip: bool, verifyGossip: bool,
skipGossipForExisting: bool,
workerId: int, workerId: int,
) {.async: (raises: [CancelledError]).} = ) {.async: (raises: [CancelledError]).} =
info "Starting state backfill gossip block offers loop", workerId info "Starting state backfill gossip block offers loop", workerId
@ -304,18 +305,29 @@ proc runBackfillGossipBlockOffersLoop(
var retryGossip = false var retryGossip = false
for k, v in offersMap: for k, v in offersMap:
try: var gossipContent = true
let numPeers = await portalClient.portal_stateGossip(k.to0xHex(), v.to0xHex()) if skipGossipForExisting:
if numPeers > 0: try:
debug "Offer successfully gossipped to peers: ", numPeers, workerId let contentInfo = await portalClient.portal_stateGetContent(k.to0xHex())
elif numPeers == 0: if contentInfo.content.len() > 0:
warn "Offer gossipped to no peers", workerId gossipContent = false
except CatchableError as e:
warn "Failed to find content with key: ",
contentKey = k.to0xHex(), error = e.msg, workerId
if gossipContent:
try:
let numPeers = await portalClient.portal_stateGossip(k.to0xHex(), v.to0xHex())
if numPeers > 0:
debug "Offer successfully gossipped to peers: ", numPeers, workerId
elif numPeers == 0:
warn "Offer gossipped to no peers", workerId
retryGossip = true
break
except CatchableError as e:
error "Failed to gossip offer to peers", error = e.msg, workerId
retryGossip = true retryGossip = true
break break
except CatchableError as e:
error "Failed to gossip offer to peers", error = e.msg, workerId
retryGossip = true
break
if retryGossip: if retryGossip:
await sleepAsync(3.seconds) await sleepAsync(3.seconds)
@ -425,7 +437,8 @@ proc runState*(config: PortalBridgeConf) =
for workerId in 1 .. config.gossipWorkersCount.int: for workerId in 1 .. config.gossipWorkersCount.int:
asyncSpawn runBackfillGossipBlockOffersLoop( asyncSpawn runBackfillGossipBlockOffersLoop(
blockOffersQueue, config.portalRpcUrl, portalNodeId, config.verifyGossip, workerId blockOffersQueue, config.portalRpcUrl, portalNodeId, config.verifyGossip,
config.skipGossipForExisting, workerId,
) )
asyncSpawn runBackfillMetricsLoop(blockDataQueue, blockOffersQueue) asyncSpawn runBackfillMetricsLoop(blockDataQueue, blockOffersQueue)