gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-31 05:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backfill peer attribution (#7762)

Browse Source 
Partly addresses https://github.com/sigp/lighthouse/issues/7744


  Implement similar peer sync attribution like in #7733 for backfill sync.
This commit is contained in:
Pawan Dhananjay
2025-08-11 19:11:56 -07:00
committed by GitHub
parent 122f16776f
commit 80ba0b169b
7 changed files with 620 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
beacon_node/network/src/sync/network_context.rs
View File

@@ -55,6 +55,9 @@ use types::{
pub mod custody;
mod requests;
/// Max retries for block components after which we fail the batch.
pub const MAX_COLUMN_RETRIES: usize = 3;
#[derive(Debug)]
pub enum RpcEvent<T> {
StreamTermination,
@@ -435,14 +438,14 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
/// the batch.
pub fn retry_columns_by_range(
&mut self,
request_id: Id,
id: Id,
peers: &HashSet<PeerId>,
peers_to_deprioritize: &HashSet<PeerId>,
request: BlocksByRangeRequest,
failed_columns: &HashSet<ColumnIndex>,
) -> Result<(), String> {
let Some(requester) = self.components_by_range_requests.keys().find_map(|r| {
if r.id == request_id {
if r.id == id {
Some(r.requester)
} else {
None
@@ -455,6 +458,8 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
debug!(
?failed_columns,
?id,
?requester,
"Retrying only failed column requests from other peers"
);
@@ -469,10 +474,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
.map_err(|e| format!("{:?}", e))?;
// Reuse the id for the request that received partially correct responses
let id = ComponentsByRangeRequestId {
id: request_id,
requester,
};
let id = ComponentsByRangeRequestId { id, requester };
let data_column_requests = columns_by_range_peers_to_request
.into_iter()
@@ -683,18 +685,16 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
match range_block_component {
RangeBlockComponent::Block(req_id, resp) => resp.and_then(|(blocks, _)| {
request.add_blocks(req_id, blocks).map_err(|e| {
RpcResponseError::BlockComponentCouplingError(CouplingError {
msg: e,
column_and_peer: None,
})
RpcResponseError::BlockComponentCouplingError(CouplingError::InternalError(
e,
))
})
}),
RangeBlockComponent::Blob(req_id, resp) => resp.and_then(|(blobs, _)| {
request.add_blobs(req_id, blobs).map_err(|e| {
RpcResponseError::BlockComponentCouplingError(CouplingError {
msg: e,
column_and_peer: None,
})
RpcResponseError::BlockComponentCouplingError(CouplingError::InternalError(
e,
))
})
}),
RangeBlockComponent::CustodyColumns(req_id, resp) => {
@@ -702,10 +702,9 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
request
.add_custody_columns(req_id, custody_columns)
.map_err(|e| {
RpcResponseError::BlockComponentCouplingError(CouplingError {
msg: e,
column_and_peer: None,
})
RpcResponseError::BlockComponentCouplingError(
CouplingError::InternalError(e),
)
})
})
}
@@ -715,10 +714,27 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
return Some(Err(e));
}
if let Some(blocks_result) = entry.get_mut().responses(&self.chain.spec) {
if blocks_result.is_ok() {
// remove the entry only if it coupled successfully with
// no errors
let range_req = entry.get_mut();
if let Some(blocks_result) = range_req.responses(&self.chain.spec) {
if let Err(CouplingError::DataColumnPeerFailure {
action: _,
error,
faulty_peers: _,
exceeded_retries,
}) = &blocks_result
{
// Remove the entry if it's a peer failure **and** retry counter is exceeded
if *exceeded_retries {
debug!(
entry=?entry.key(),
msg = error,
"Request exceeded max retries, failing batch"
);
entry.remove();
};
} else {
// also remove the entry only if it coupled successfully
// or if it isn't a column peer failure.
entry.remove();
}
// If the request is finished, dequeue everything