fix(l2): shutdown node with ctrl+c #5208
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lines of code reportTotal lines added: Detailed view |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the sequencer startup to return handles for the L1 committer and block producer, along with a driver future, enabling proper shutdown coordination. It adds Abort message handling to both the L1Committer and BlockProducer GenServers and updates the initialization logic to send abort messages during shutdown.
- Modifies
start_l2to return handles and a driver future instead of running to completion - Adds
Abortmessage variants toL1CommitterandBlockProducerfor graceful shutdown - Updates shutdown logic to send abort messages to GenServer handles before cancellation
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| crates/l2/sequencer/mod.rs | Changes return type to include GenServer handles and driver future; wraps sequencer logic in pinned async block |
| crates/l2/sequencer/l1_committer.rs | Adds Abort message handling with CastResponse::Stop and refactors handle_cast to use pattern matching |
| crates/l2/sequencer/block_producer.rs | Adds Abort message handling with CastResponse::Stop and refactors handle_cast to use pattern matching |
| cmd/ethrex/l2/initializers.rs | Updates initialization to receive handles and driver, sends abort messages in both shutdown branches |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
ilitteri
reviewed
Nov 6, 2025
cmd/ethrex/l2/initializers.rs
Outdated
Comment on lines
307
to
320
| if let Some(mut handle) = committer_handle.clone() { | ||
| handle | ||
| .cast(l1_committer::InMessage::Abort) | ||
| .await | ||
| .inspect_err(|err| warn!("Failed to send committer abort: {err:?}")) | ||
| .ok(); | ||
| } | ||
| if let Some(mut handle) = block_producer_handle.clone() { | ||
| handle | ||
| .cast(block_producer::InMessage::Abort) | ||
| .await | ||
| .inspect_err(|err| warn!("Failed to send block producer abort: {err:?}")) | ||
| .ok(); | ||
| } |
Contributor
There was a problem hiding this comment.
Can we abstract this functionality into a shutdown function?
ilitteri
approved these changes
Nov 10, 2025
avilagaston9
approved these changes
Nov 10, 2025
crates/l2/sequencer/l1_committer.rs
Outdated
| self.last_committed_batch = current_last_committed_batch; | ||
| self.last_committed_batch_timestamp = current_time; | ||
| match message { | ||
| InMessage::Commit => { |
Contributor
There was a problem hiding this comment.
Maybe we can move the handling of this message to its own function for clarity.
xqft
pushed a commit
that referenced
this pull request
Nov 11, 2025
**Motivation** The L2 node is not stopping after pressing `ctrl+c`. This is because the abort of the `l2_sequencer` does not stop block task such as block producer and l1 committer **Description** - Add new `InMessage` to abort l1 committer and block producer tasks - Change `start_l2` to return handles of the blocking tasks --------- Co-authored-by: Ivan Litteri <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
The L2 node is not stopping after pressing
ctrl+c. This is because the abort of thel2_sequencerdoes not stop block task such as block producer and l1 committerDescription
InMessageto abort l1 committer and block producer tasksstart_l2to return handles of the blocking tasks