Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Minor fixes #6533

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Minor fixes #6533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4035067
Minor fixes
mrcnski Jan 10, 2023
c26c03f
Fix compile errors
mrcnski Jan 10, 2023
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
5 changes: 1 addition & 4 deletions node/core/pvf/src/execute/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,8 @@ pub async fn start_work(
target: LOG_TARGET,
worker_pid = %pid,
validation_code_hash = ?artifact.id.code_hash,
"execution worker exceeded allotted time for execution",
"execution worker exceeded lenient timeout for execution, child worker likely stalled",
);
// TODO: This case is not really a hard timeout as the timeout here in the host is
// lenient. Should fix this as part of
// https://github.com/paritytech/polkadot/issues/3754.
Response::TimedOut
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just leaving this error as-is. If we hit this case we should just treat it the same as any other timeout, i.e. kill the worker. The log above should be good enough to inform users what happened.

I had some thoughts at the time about refactoring the execution errors, like we did for preparation. However, looking at the errors here, there don't seem to be any easy wins for simplicity or semantic correctness.

},
};
Expand Down
2 changes: 1 addition & 1 deletion node/network/dispute-distribution/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ impl<AD> DisputeDistributionSubsystem<AD>
where
AD: AuthorityDiscovery + Clone,
{
/// Create a new instance of the availability distribution.
/// Create a new instance of the dispute distribution.
pub fn new(
keystore: SyncCryptoStorePtr,
req_receiver: IncomingRequestReceiver<v1::DisputeRequest>,
Expand Down
3 changes: 1 addition & 2 deletions node/subsystem-util/src/nesting_sender.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,9 @@ where

// Helper traits and implementations:

impl<M, M1> Clone for NestingSender<M, M1>
impl<M> Clone for NestingSender<M, M>
Copy link
Contributor Author

@mrcnski mrcnski Jan 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

M, M1 was a relic from an old version of the file. I changed it to M, M to be consistent with the constructor M, Mnested to be consistent with the main impl.

where
M: 'static,
M1: 'static,
{
fn clone(&self) -> Self {
Self { sender: self.sender.clone(), conversion: self.conversion.clone() }
Expand Down