Hare/yoi
1
1
Fork 0
Code Actions Packages Releases Activity

fix: retry rejected automatic worker restores

Browse Source
This commit is contained in:
Hare
2026-09-24 21:41:43 +09:00
parent 1e4fcd170c
commit 0aa3752bf8
1 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/worker-runtime/src/runtime.rs
+65 -9
View File
@@ -1646,10 +1646,15 @@ impl Runtime {
"Worker restore cleanup or reconciliation is still pending",
));
}
match mode {
WorkerRestoreMode::Explicit
if worker.execution_metadata_available
&& worker.status != WorkerStatus::Stopped =>
// An active persisted Worker can still have no live handle when its
// startup restore was rejected before side effects (for example,
// before Workspace Backend renewed operation-scoped Repository
// access). Preserve its automatic intent so an explicit restore can
// serve as the authorized retry for that state.
if mode == WorkerRestoreMode::Explicit
&& worker.execution_metadata_available
&& worker.status != WorkerStatus::Stopped
&& worker.restore_intent != WorkerRestoreIntent::Automatic
{
return Ok(RuntimeWorkerRestoreResult::failed(
WorkerRestoreState::Rejected,
@@ -1657,14 +1662,12 @@ impl Runtime {
"Worker restore requires a stopped Worker",
));
}
WorkerRestoreMode::Automatic
if !worker.status.is_active()
|| worker.restore_intent != WorkerRestoreIntent::Automatic =>
if mode == WorkerRestoreMode::Automatic
&& (!worker.status.is_active()
|| worker.restore_intent != WorkerRestoreIntent::Automatic)
{
return Ok(RuntimeWorkerRestoreResult::accepted(worker.detail()));
}
_ => {}
}
let Some(worker_request) = worker.request.clone() else {
return Ok(RuntimeWorkerRestoreResult::failed(
WorkerRestoreState::Rejected,
@@ -8035,6 +8038,59 @@ mod tests {
let _ = std::fs::remove_dir_all(root);
}
#[cfg(feature = "fs-store")]
#[test]
fn fs_store_explicitly_retries_rejected_automatic_restore() {
let root = fs_store_root("retry-rejected-automatic-restore");
let options = crate::fs_store::FsRuntimeStoreOptions {
root: root.clone(),
runtime_id: "test-runtime".to_string(),
display_name: None,
};
let runtime = Runtime::with_fs_store_and_execution_backend(
options.clone(),
Arc::new(TestExecutionBackend::default()),
)
.unwrap();
runtime.store_config_bundle(test_bundle()).unwrap();
let worker = runtime
.create_worker(task_request("retry rejected automatic restore"))
.unwrap();
drop(runtime);
let restoring_backend = Arc::new(TestExecutionBackend::default());
*restoring_backend.restore_result.lock().unwrap() = Some(
WorkerExecutionSpawnResult::Rejected(WorkerExecutionResult::rejected(
WorkerExecutionOperation::Restore,
"repository access must be reacquired",
)),
);
let restored =
Runtime::with_fs_store_and_execution_backend(options, restoring_backend.clone())
.unwrap();
assert_eq!(*restoring_backend.restore_count.lock().unwrap(), 1);
let pending_worker = restored.worker_detail(&worker.worker_ref).unwrap();
assert_eq!(pending_worker.status, WorkerStatus::Idle);
assert!(pending_worker.execution_metadata_available);
restoring_backend.restore_result.lock().unwrap().take();
let retry = restored
.restore_worker_operation(&worker.worker_ref)
.unwrap();
assert_eq!(retry.state, WorkerRestoreState::Accepted);
assert_eq!(*restoring_backend.restore_count.lock().unwrap(), 2);
restored
.send_input(
&worker.worker_ref,
WorkerInput::user("after repository access renewal"),
)
.unwrap();
let _ = std::fs::remove_dir_all(root);
}
#[test]
fn restore_preflight_rejection_is_typed_and_side_effect_free() {
let (runtime, backend) = runtime_and_backend();