Skip to content

Make Instance:;start infallible #1812

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make Instance:;start infallible #1812

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: 7 additions & 7 deletions hyperactor/src/proc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,10 @@ impl Proc {
.ledger
.insert(actor_id.clone(), instance.cell.downgrade())?;

instance
Ok(instance
.start(actor, actor_loop_receivers.take().unwrap(), work_rx)
.instrument(span)
.await
.await)
}

/// Create and return an actor instance and its corresponding handle. This allows actors to be
Expand Down Expand Up @@ -575,9 +575,9 @@ impl Proc {
let (instance, mut actor_loop_receivers, work_rx) =
Instance::new(self.clone(), actor_id, false, Some(parent.clone()));
let actor = A::new(params).await?;
instance
Ok(instance
.start(actor, actor_loop_receivers.take().unwrap(), work_rx)
.await
.await)
}

/// Call `abort` on the `JoinHandle` associated with the given
Expand Down Expand Up @@ -1061,13 +1061,13 @@ impl<A: Actor> Instance<A> {

/// Start an A-typed actor onto this instance with the provided params. When spawn returns,
/// the actor has been linked with its parent, if it has one.
#[hyperactor::instrument(fields(actor_id=self.cell.actor_id().clone().to_string(), actor_name=self.cell.actor_id().name()))]
#[hyperactor::instrument_infallible(fields(actor_id=self.cell.actor_id().clone().to_string(), actor_name=self.cell.actor_id().name()))]
async fn start(
self,
actor: A,
actor_loop_receivers: (PortReceiver<Signal>, PortReceiver<ActorSupervisionEvent>),
work_rx: mpsc::UnboundedReceiver<WorkCell<A>>,
) -> Result<ActorHandle<A>, anyhow::Error> {
) -> ActorHandle<A> {
let instance_cell = self.cell.clone();
let actor_id = self.cell.actor_id().clone();
let actor_handle = ActorHandle::new(self.cell.clone(), self.ports.clone());
Expand All @@ -1081,7 +1081,7 @@ impl<A: Actor> Instance<A> {
.set(actor_task_handle)
.unwrap_or_else(|_| panic!("{}: task handle store failed", actor_id));

Ok(actor_handle)
actor_handle
}

async fn serve(
Expand Down
Loading