fix(pb): fix actor reschedule with wrong image (#2428)

<!-- Please make sure there is an issue that this PR is correlated to. -->
Fixes RVT-4721
## Changes

<!-- If there are frontend changes, please include screenshots. -->

Author: MasterPtato

packages/edge/infra/client/manager/src/actor/setup.rs

@@ -841,7 +841,7 @@ impl Actor {
 			Path::new("/proc/1/ns/net").to_path_buf()
 		} else {
 			// CNI network that will be created
-			Path::new("/var/run/netns").join(self.actor_id.to_string())
+			Path::new("/var/run/netns").join(format!("{}-{}", self.actor_id, self.generation))
 		}
 	}
 

packages/edge/services/pegboard/src/workflows/actor/mod.rs

@@ -147,7 +147,7 @@ pub async fn pegboard_actor(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResul
 
 	let state_res = ctx
 		.loope(
-			runtime::State::new(client_id, client_workflow_id),
+			runtime::State::new(client_id, client_workflow_id, input.image_id),
 			|ctx, state| {
 				let input = input.clone();
 
@@ -173,8 +173,13 @@ pub async fn pegboard_actor(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResul
 							)
 							.await?;
 
-							if let Some(sig) =
-								runtime::reschedule_actor(ctx, &input, state, None).await?
+							if let Some(sig) = runtime::reschedule_actor(
+								ctx,
+								&input,
+								state,
+								state.image_id.unwrap_or(input.image_id),
+							)
+							.await?
 							{
 								// Destroyed early
 								return Ok(Loop::Break(runtime::StateRes {
@@ -307,9 +312,14 @@ pub async fn pegboard_actor(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResul
 											.await?;
 										}
 
-										if runtime::reschedule_actor(ctx, &input, state, None)
-											.await?
-											.is_some()
+										if runtime::reschedule_actor(
+											ctx,
+											&input,
+											state,
+											state.image_id.unwrap_or(input.image_id),
+										)
+										.await?
+										.is_some()
 										{
 											// Destroyed early
 											return Ok(Loop::Break(runtime::StateRes {
@@ -364,9 +374,19 @@ pub async fn pegboard_actor(ctx: &mut WorkflowCtx, input: &Input) -> GlobalResul
 							)
 							.await?;
 
-							if let Some(sig) =
-								runtime::reschedule_actor(ctx, &input, state, Some(sig.image_id))
-									.await?
+							ctx.activity(runtime::UpdateImageInput {
+								image_id: sig.image_id,
+							})
+							.await?;
+							state.image_id = Some(sig.image_id);
+
+							if let Some(sig) = runtime::reschedule_actor(
+								ctx,
+								&input,
+								state,
+								state.image_id.unwrap_or(input.image_id),
+							)
+							.await?
 							{
 								// Destroyed early
 								return Ok(Loop::Break(runtime::StateRes {

packages/edge/services/pegboard/src/workflows/actor/runtime.rs

@@ -28,16 +28,18 @@ pub struct State {
 	pub generation: u32,
 	pub client_id: Uuid,
 	pub client_workflow_id: Uuid,
+	pub image_id: Option<Uuid>,
 	pub drain_timeout_ts: Option<i64>,
 	pub gc_timeout_ts: Option<i64>,
 }
 
 impl State {
-	pub fn new(client_id: Uuid, client_workflow_id: Uuid) -> Self {
+	pub fn new(client_id: Uuid, client_workflow_id: Uuid, image_id: Uuid) -> Self {
 		State {
 			generation: 0,
 			client_id,
 			client_workflow_id,
+			image_id: Some(image_id),
 			drain_timeout_ts: None,
 			gc_timeout_ts: Some(util::timestamp::now() + ACTOR_START_THRESHOLD_MS),
 		}
@@ -655,7 +657,7 @@ pub async fn spawn_actor(
 		generation,
 		config: Box::new(protocol::ActorConfig {
 			image: protocol::Image {
-				id: input.image_id,
+				id: actor_setup.image_id,
 				artifact_url_stub: actor_setup.artifact_url_stub.clone(),
 				fallback_artifact_url: actor_setup.fallback_artifact_url.clone(),
 				kind: match actor_setup.meta.build_kind {
@@ -749,20 +751,19 @@ pub async fn reschedule_actor(
 	ctx: &mut WorkflowCtx,
 	input: &Input,
 	state: &mut State,
-	new_image_id: Option<Uuid>,
+	image_id: Uuid,
 ) -> GlobalResult<Option<Destroy>> {
 	tracing::debug!(actor_id=?input.actor_id, "rescheduling actor");
 
 	ctx.activity(ClearPortsAndResourcesInput {
 		actor_id: input.actor_id,
-		image_id: new_image_id.unwrap_or(input.image_id),
+		image_id,
 		client_id: state.client_id,
 		client_workflow_id: state.client_workflow_id,
 	})
 	.await?;
 
-	let actor_setup =
-		setup::setup(ctx, &input, setup::SetupCtx::Reschedule { new_image_id }).await?;
+	let actor_setup = setup::setup(ctx, &input, setup::SetupCtx::Reschedule { image_id }).await?;
 
 	let next_generation = state.generation + 1;
 

packages/edge/services/pegboard/src/workflows/actor/setup.rs

@@ -6,7 +6,7 @@ use foundationdb as fdb;
 use sqlx::Acquire;
 use util::serde::AsHashableExt;
 
-use super::{runtime, Input, Port};
+use super::{Input, Port};
 use crate::{
 	keys, protocol,
 	types::{ActorLifecycle, ActorResources, GameGuardProtocol, NetworkMode, Routing},
@@ -519,12 +519,13 @@ pub enum SetupCtx {
 		network_ports: util::serde::HashableMap<String, Port>,
 	},
 	Reschedule {
-		new_image_id: Option<Uuid>,
+		image_id: Uuid,
 	},
 }
 
 #[derive(Clone)]
 pub struct ActorSetupCtx {
+	pub image_id: Uuid,
 	pub meta: GetMetaOutput,
 	pub resources: protocol::Resources,
 	pub artifact_url_stub: String,
@@ -564,15 +565,7 @@ pub async fn setup(
 
 			input.image_id
 		}
-		SetupCtx::Reschedule { new_image_id } => {
-			if let Some(image_id) = new_image_id {
-				ctx.activity(runtime::UpdateImageInput { image_id }).await?;
-
-				image_id
-			} else {
-				input.image_id
-			}
-		}
+		SetupCtx::Reschedule { image_id } => image_id,
 	};
 
 	let meta = ctx
@@ -596,6 +589,7 @@ pub async fn setup(
 		.await?;
 
 	Ok(ActorSetupCtx {
+		image_id,
 		meta,
 		resources,
 		artifact_url_stub: artifacts_res.artifact_url_stub,