Skip to content

Extract send_timing method; log errors. #4463

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
afck merged 1 commit into from
Sep 2, 2025
Merged

Extract send_timing method; log errors. #4463

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
38 changes: 13 additions & 25 deletions linera-core/src/client/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2035,12 +2035,7 @@ impl<Env: Environment> ChainClient<Env> {
self.communicate_chain_updates(&new_committee).await?;
}
}
if let Some(sender) = &self.timing_sender {
let _ = sender.send((
update_validators_start.elapsed().as_millis() as u64,
TimingType::UpdateValidators,
));
}
self.send_timing(update_validators_start, TimingType::UpdateValidators);
Ok(())
}

Expand Down Expand Up @@ -2328,12 +2323,7 @@ impl<Env: Environment> ChainClient<Env> {
// TODO(#2066): Remove boxing once the call-stack is shallower
match Box::pin(self.execute_block(operations.clone(), blobs.clone())).await {
Ok(ExecuteBlockOutcome::Executed(certificate)) => {
if let Some(sender) = &self.timing_sender {
let _ = sender.send((
execute_block_start.elapsed().as_millis() as u64,
TimingType::ExecuteBlock,
));
}
self.send_timing(execute_block_start, TimingType::ExecuteBlock);
break Ok(ClientOutcome::Committed(certificate));
}
Ok(ExecuteBlockOutcome::WaitForTimeout(timeout)) => {
Expand Down Expand Up @@ -2361,12 +2351,7 @@ impl<Env: Environment> ChainClient<Env> {
};
};

if let Some(sender) = &self.timing_sender {
let _ = sender.send((
timing_start.elapsed().as_millis() as u64,
TimingType::ExecuteOperations,
));
}
self.send_timing(timing_start, TimingType::ExecuteOperations);

result
}
Expand Down Expand Up @@ -2903,18 +2888,21 @@ impl<Env: Environment> ChainClient<Env> {
.await?;
self.client.finalize_block(&committee, certificate).await?
};
if let Some(sender) = &self.timing_sender {
let _ = sender.send((
submit_block_proposal_start.elapsed().as_millis() as u64,
TimingType::SubmitBlockProposal,
));
}

self.send_timing(submit_block_proposal_start, TimingType::SubmitBlockProposal);
debug!(round = %certificate.round, "Sending confirmed block to validators");
self.update_validators(Some(&committee)).await?;
Ok(ClientOutcome::Committed(Some(certificate)))
}

fn send_timing(&self, start: Instant, timing_type: TimingType) {
let Some(sender) = &self.timing_sender else {
return;
};
if let Err(err) = sender.send((start.elapsed().as_millis() as u64, timing_type)) {
tracing::warn!(%err, "Failed to send timing info");
}
}

/// Requests a leader timeout certificate if the current round has timed out. Returns the
/// chain info for the (possibly new) current round.
async fn request_leader_timeout_if_needed(&self) -> Result<Box<ChainInfo>, ChainClientError> {
Expand Down
Loading