Skip to content
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

Improves panic message if send() fails in streaming_unpack_snapshot() #2459

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Improves panic message if send() fails in streaming_unpack_snapshot() #2459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 1 deletion accounts-db/src/hardened_unpack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,13 @@ pub fn streaming_unpack_snapshot<A: Read>(
|_, _| {},
|entry_path_buf| {
if entry_path_buf.is_file() {
sender.send(entry_path_buf).unwrap();
let result = sender.send(entry_path_buf);
if let Err(err) = result {
panic!(
"failed to send path '{}' from unpacker to rebuilder: {err}",
err.0.display(),
Copy link

@steviez steviez Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

entry_path_buf instead of err.0.display right ?

Copy link
Author

@brooksprumo brooksprumo Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, ish. The entry_path_buf was moved into the send, so we'd have to clone it. But conveniently, if send returns an Error, it puts the T back inside. So in our case here, err.0 is entry_path_buf and we don't need to clone it.

Copy link

Choose a reason for hiding this comment

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

Oh nice, was not aware. And it looks like the Display impl for SendError does NOT print the T so we will not be double printing out the T.
https://docs.rs/crossbeam-channel/0.5.11/src/crossbeam_channel/err.rs.html#124-128

nit: Thoughts on using into_inner() over .0 ? I doubt crossbeam would be adding additional items (and reordering them) at this point, but I feel like into_inner() is slighter more expressive
https://docs.rs/crossbeam/latest/crossbeam/channel/struct.SendError.html#method.into_inner

Copy link
Author

@brooksprumo brooksprumo Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

If we used into_inner(), would we lose the ability to log the error itself though?

Copy link

Choose a reason for hiding this comment

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

Hmm yeah, I guess since we're inside a let Err(err) = ... block, we can't call into_innter() as that would move it. So, we'd have to clone; granted this isn't a big deal since the clone would be in the same line that we're panicking, but I think we can leave the .0 too

);
}
}
},
)
Expand Down