Skip to content

Add missing error log and remove redundant id field from lookup logs #6990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 4, 2025
Merged

Add missing error log and remove redundant id field from lookup logs #6990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e76b69e
Add missing error log and remove redundant id field from lookup logs.
jimmygchen Feb 12, 2025
5eb0c6e
Delete logging.
jimmygchen Apr 1, 2025
c53f808
Merge remote-tracking branch 'origin/unstable' into add-err-log
jimmygchen Apr 1, 2025
e34f743
Merge branch 'unstable' into add-err-log
eserilev Apr 3, 2025
4c60776
Merge branch 'unstable' into add-err-log
jimmygchen Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions beacon_node/network/src/sync/network_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,14 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
let request = entry.remove();
let blocks = request
.into_responses(&self.chain.spec)
.inspect_err(|e| {
debug!(
self.log,
"Failed to convert range block components into RpcBlock";
"id" => %id,
"error" => e
)
})
Copy link
Collaborator

@dapplion dapplion Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superseded by #6991

Copy link
Member Author

@jimmygchen jimmygchen Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted

Copy link
Member Author

@jimmygchen jimmygchen Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, please re-review @dapplion

.map_err(RpcResponseError::BlockComponentCouplingError);
Some(blocks)
} else {
Expand Down
4 changes: 0 additions & 4 deletions beacon_node/network/src/sync/network_context/custody.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
let Some(batch_request) = self.active_batch_columns_requests.get_mut(&req_id) else {
warn!(self.log,
"Received custody column response for unrequested index";
"id" => ?self.custody_id,
"block_root" => ?self.block_root,
"req_id" => %req_id,
);
Expand All @@ -117,7 +116,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
Ok((data_columns, seen_timestamp)) => {
debug!(self.log,
"Custody column download success";
"id" => ?self.custody_id,
"block_root" => ?self.block_root,
"req_id" => %req_id,
"peer" => %peer_id,
Expand Down Expand Up @@ -165,7 +163,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
// Note: Batch logging that columns are missing to not spam logger
debug!(self.log,
"Custody column peer claims to not have some data";
"id" => ?self.custody_id,
"block_root" => ?self.block_root,
"req_id" => %req_id,
"peer" => %peer_id,
Expand All @@ -179,7 +176,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
Err(err) => {
debug!(self.log,
"Custody column download error";
"id" => ?self.custody_id,
"block_root" => ?self.block_root,
"req_id" => %req_id,
"peer" => %peer_id,
Expand Down