Skip to content

fix(rivetkit-core): honor ctx.destroy() requested during a sleep grace #5537

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-destroy-actor-on-sleep-instead-of-parking-it-uqmvykru
Choose a base branch
from
Open

fix(rivetkit-core): honor ctx.destroy() requested during a sleep grace #5537

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
14 changes: 12 additions & 2 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 @@ -1534,12 +1534,22 @@ impl ActorTask {
}
}

/// Escalate a sleep grace to a destroy so `ctx.destroy()` called during the
/// sleep handler is honored instead of finalizing as a sleep.
fn finalize_shutdown_reason(&self, grace_reason: ShutdownKind) -> ShutdownKind {
if grace_reason == ShutdownKind::Sleep && self.ctx.destroy_requested() {
ShutdownKind::Destroy
} else {
grace_reason
}
}

fn try_finish_grace(&mut self) -> Option<LiveExit> {
let Some(grace) = self.sleep_grace.as_ref() else {
return None;
};
if self.ctx.can_finalize_shutdown(grace.reason) {
let reason = grace.reason;
let reason = self.finalize_shutdown_reason(grace.reason);
self.sleep_grace = None;
return Some(LiveExit::Shutdown { reason });
}
Expand Down Expand Up @@ -1576,7 +1586,7 @@ impl ActorTask {
"actor shutdown reached the grace deadline"
);
Some(LiveExit::Shutdown {
reason: grace.reason,
reason: self.finalize_shutdown_reason(grace.reason),
})
}

Expand Down
Loading