Skip to content

fix(rivetkit-core): cancel driver alarm before sqlite teardown on destroy #5530

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

Open
abcxff wants to merge 1 commit into
base: stack/feat-container-runner-keep-instance-warm-instead-of-self-exiting-qqzrqpro
Choose a base branch
from
Open

fix(rivetkit-core): cancel driver alarm before sqlite teardown on destroy #5530

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
29 changes: 20 additions & 9 deletions rivetkit-rust/packages/rivetkit-core/src/actor/task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,6 +1801,25 @@ impl ActorTask {
step = "sync_alarm",
"actor shutdown cleanup step completed"
);
// Destroy cancels the engine-side alarm BEFORE the SQLite teardown.
// `cancel_driver_alarm_logged` issues a `set_alarm(None)` that spawns a
// last-pushed-alarm SQLite persist; running it here (rather than after
// `cleanup_sqlite`) lets `wait_for_pending_alarm_writes` below await that
// persist so it cannot race the teardown and fail with
// `transaction_closed`. Sleep keeps the persisted engine alarm armed for
// the next instance, so it only aborts the local timer, after cleanup.
match reason {
ShutdownKind::Destroy => {
ctx.cancel_driver_alarm_logged();
tracing::debug!(
actor_id = %actor_id,
reason = reason_label,
step = "cancel_driver_alarm",
"actor shutdown cleanup step completed"
);
}
ShutdownKind::Sleep => {}
}
ctx.wait_for_pending_alarm_writes().await;
tracing::debug!(
actor_id = %actor_id,
Expand Down Expand Up @@ -1834,15 +1853,7 @@ impl ActorTask {
"actor shutdown cleanup step completed"
);
}
ShutdownKind::Destroy => {
ctx.cancel_driver_alarm_logged();
tracing::debug!(
actor_id = %actor_id,
reason = reason_label,
step = "cancel_driver_alarm",
"actor shutdown cleanup step completed"
);
}
ShutdownKind::Destroy => {}
}
Ok(())
}
Expand Down
Loading