Skip to content

Commit 85ac2d7

Browse files
committed
fix(server): use ObjectMeta accessors for Sandbox id/name in compute resume
1 parent 8691d0d commit 85ac2d7

1 file changed

Lines changed: 14 additions & 10 deletions

File tree

  • crates/openshell-server/src/compute

crates/openshell-server/src/compute/mod.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,14 @@ impl ComputeRuntime {
588588
continue;
589589
}
590590

591-
match resume.resume_sandbox(&sandbox.id, &sandbox.name).await {
591+
match resume
592+
.resume_sandbox(sandbox.object_id(), sandbox.object_name())
593+
.await
594+
{
592595
Ok(true) => {
593596
info!(
594-
sandbox_id = %sandbox.id,
595-
sandbox_name = %sandbox.name,
597+
sandbox_id = %sandbox.object_id(),
598+
sandbox_name = %sandbox.object_name(),
596599
?phase,
597600
"Resumed sandbox during gateway startup"
598601
);
@@ -605,8 +608,8 @@ impl ComputeRuntime {
605608
// will eventually prune it after the orphan grace
606609
// period.
607610
warn!(
608-
sandbox_id = %sandbox.id,
609-
sandbox_name = %sandbox.name,
611+
sandbox_id = %sandbox.object_id(),
612+
sandbox_name = %sandbox.object_name(),
610613
"Cannot resume sandbox: backend resource is missing"
611614
);
612615
self.mark_sandbox_error(
@@ -619,8 +622,8 @@ impl ComputeRuntime {
619622
}
620623
Err(err) => {
621624
warn!(
622-
sandbox_id = %sandbox.id,
623-
sandbox_name = %sandbox.name,
625+
sandbox_id = %sandbox.object_id(),
626+
sandbox_name = %sandbox.object_name(),
624627
error = %err,
625628
"Failed to resume sandbox during gateway startup"
626629
);
@@ -650,9 +653,10 @@ impl ComputeRuntime {
650653
let _guard = self.sync_lock.lock().await;
651654
let mut updated = sandbox.clone();
652655
updated.phase = SandboxPhase::Error as i32;
656+
let updated_name = updated.object_name().to_string();
653657
upsert_ready_condition(
654658
&mut updated.status,
655-
&updated.name,
659+
&updated_name,
656660
SandboxCondition {
657661
r#type: "Ready".to_string(),
658662
status: "False".to_string(),
@@ -664,13 +668,13 @@ impl ComputeRuntime {
664668
self.sandbox_index.update_from_sandbox(&updated);
665669
if let Err(err) = self.store.put_message(&updated).await {
666670
warn!(
667-
sandbox_id = %sandbox.id,
671+
sandbox_id = %sandbox.object_id(),
668672
error = %err,
669673
"Failed to persist sandbox error state during startup resume"
670674
);
671675
return;
672676
}
673-
self.sandbox_watch_bus.notify(&sandbox.id);
677+
self.sandbox_watch_bus.notify(sandbox.object_id());
674678
}
675679

676680
async fn watch_loop(self: Arc<Self>) {

0 commit comments

Comments
 (0)