fix: shutdown ordering tasks with sigint #629
Open
+229
−87
Conversation
This file contains 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
could take hours and it wouldn't shutdown with interrupt. if you killed the process you might leave the lock on the sqlite db and need fuser to find and kill the pid to release it
dav1do
commented
Dec 6, 2024
| @@ -1416,7 +1416,9 @@ mod tests { | |||
| let sql_pool = SqlitePool::connect_in_memory().await.unwrap(); | |||
|
|
|||
| let metrics = Metrics::register(&mut prometheus_client::registry::Registry::default()); | |||
| let store = Arc::new(EventService::try_new(sql_pool, true, true, vec![]).await?); | |||
| let store = Arc::new( | |||
| EventService::try_new(sql_pool, UndeliveredEventReview::Skip, true, vec![]).await?, | |||
There was a problem hiding this comment.
I changed this behavior to skip ordering here but I don't think it is necessary for these tests.
dav1do
commented
Dec 6, 2024
| @@ -434,8 +436,19 @@ pub async fn run(opts: DaemonOpts) -> Result<()> { | |||
| let peer_svc = Arc::new(PeerService::new(sqlite_pool.clone())); | |||
| let interest_svc = Arc::new(InterestService::new(sqlite_pool.clone())); | |||
| let event_validation = opts.event_validation.unwrap_or(true); | |||
| let mut ss = shutdown_signal.resubscribe(); | |||
| let event_svc = Arc::new( | |||
There was a problem hiding this comment.
this whole PR could probably be redone as simply this (which I didn't think of for some reason)... piping it down could allow for a chance to exit gracefully and clean up, but it's more or less implemented like this currently just lower
let mut ss = shutdown_signal.resubscribe();
let event_svc = tokio::select! {
svc = EventService::try_new(sqlite_pool.clone(), true, event_validation, rpc_providers) => {
Arc::new(svc?)
}
_ = ss.recv() => {
bail!("received shutdown signal before startup tasks finished")
}
};
```
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.
The ordering tasks wouldn't shutdown gracefully and could take forever. Worst case you killed the process and left a lock on the sqlite file and had to go find another pid to kill it. Now they exit with sigint.