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

fix: fixed panic propagation #2525

Merged
merged 2 commits into from
Jul 29, 2024
Merged

fix: fixed panic propagation #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14220b9
fixed error/panic propagation in consensus layer
pompon0 Jul 29, 2024
7f8b6cc
ignoring Canceled error
pompon0 Jul 29, 2024
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
10 changes: 6 additions & 4 deletions core/node/node_framework/src/implementations/layers/consensus/external_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::Context as _;
use zksync_concurrency::{ctx, scope};
use zksync_concurrency::{ctx, scope, sync};
use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
use zksync_dal::{ConnectionPool, Core};
use zksync_node_consensus as consensus;
Expand Down Expand Up @@ -110,8 +110,7 @@ impl Task for ExternalNodeTask {
// Note, however, that awaiting for the `stop_receiver` is related to the root context behavior,
// not the consensus task itself. There may have been any number of tasks running in the root context,
// but we only need to wait for stop signal once, and it will be propagated to all child contexts.
let root_ctx = ctx::root();
scope::run!(&root_ctx, |ctx, s| async {
scope::run!(&ctx::root(), |ctx, s| async {
s.spawn_bg(consensus::era::run_external_node(
ctx,
self.config,
Expand All @@ -120,7 +119,10 @@ impl Task for ExternalNodeTask {
self.main_node_client,
self.action_queue_sender,
));
let _ = stop_receiver.0.wait_for(|stop| *stop).await?;
// `run_external_node` might return an error or panic,
// in which case we need to return immediately,
// rather than wait for the `stop_receiver`.
let _ = sync::wait_for(ctx, &mut stop_receiver.0, |stop| *stop).await;
Ok(())
})
.await
Expand Down
12 changes: 8 additions & 4 deletions core/node/node_framework/src/implementations/layers/consensus/main_node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use zksync_concurrency::{ctx, scope};
use zksync_concurrency::{ctx, scope, sync};
use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
use zksync_dal::{ConnectionPool, Core};
use zksync_node_consensus as consensus;
Expand Down Expand Up @@ -74,15 +74,19 @@ impl Task for MainNodeConsensusTask {
// Note, however, that awaiting for the `stop_receiver` is related to the root context behavior,
// not the consensus task itself. There may have been any number of tasks running in the root context,
// but we only need to wait for stop signal once, and it will be propagated to all child contexts.
let root_ctx = ctx::root();
scope::run!(&root_ctx, |ctx, s| async move {
scope::run!(&ctx::root(), |ctx, s| async move {
s.spawn_bg(consensus::era::run_main_node(
ctx,
self.config,
self.secrets,
self.pool,
));
let _ = stop_receiver.0.wait_for(|stop| *stop).await?;
// `run_main_node` might return an error or panic,
// in which case we need to return immediately,
// rather than wait for the `stop_receiver`.
// We ignore the `Canceled` error and return `Ok()` instead,
// because cancellation is expected.
let _ = sync::wait_for(ctx, &mut stop_receiver.0, |stop| *stop).await;
Ok(())
})
.await
Expand Down
Loading