Sasedev/khadhroony-solana-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.3.15-pre.008-fix.003

Browse Source
This commit is contained in:
SinuS von SifriduS
2026-09-13 23:05:18 +02:00
parent ee658eb862
commit 11e5247fbf
6 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
crates/ksp-app-raw-transaction-ingest-desk/src/route_runtime.rs
View File

@@ -1,5 +1,5 @@
// file: crates/ksp-app-raw-transaction-ingest-desk/src/route_runtime.rs
// version: 3
// version: 4
//! Mono-route Store and Worker lifecycle owned by Raw Transaction Ingest Desk.
@@ -8,6 +8,7 @@ const STORE_RECLAIM_POLL_INTERVAL: std::time::Duration = std::time::Duration::fr
const STORE_RECLAIM_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(1);
struct RouteRuntimeInner {
last_terminal: std::option::Option<crate::RawIngestRouteRuntimeDto>,
next_sequence: u64,
slot: RouteRuntimeSlot,
}
@@ -21,7 +22,9 @@ impl crate::RouteRuntimeState {
/// Creates an idle mono-route runtime state.
#[must_use]
pub(crate) fn new() -> Self {
return Self { inner: std::sync::Mutex::new(RouteRuntimeInner { next_sequence: 0, slot: RouteRuntimeSlot::Idle }) };
return Self {
inner: std::sync::Mutex::new(RouteRuntimeInner { last_terminal: std::option::Option::None, next_sequence: 0, slot: RouteRuntimeSlot::Idle }),
};
}
fn reserve(&self, prepared: &crate::PreparedRouteStart) -> ksp_core_lib::Result<RouteRuntimeReservation> {
@@ -63,6 +66,7 @@ impl crate::RouteRuntimeState {
profile_id: prepared.profile_id.clone(),
route_id: prepared.route_id,
};
inner.last_terminal = std::option::Option::None;
inner.next_sequence = sequence;
inner.slot = RouteRuntimeSlot::Starting { token: sequence };
return std::result::Result::Ok(RouteRuntimeReservation { identity, token: sequence, worker_id });
@@ -103,13 +107,14 @@ impl crate::RouteRuntimeState {
}
}
fn finish(&self, token: u64) {
fn finish(&self, token: u64, terminal: crate::RawIngestRouteRuntimeDto) {
let inner = self.inner.lock();
let mut inner = match inner {
std::result::Result::Ok(value) => value,
std::result::Result::Err(_) => return,
};
if matches!(&inner.slot, RouteRuntimeSlot::Active { token: current, .. } if *current == token) {
inner.last_terminal = std::option::Option::Some(terminal);
inner.slot = RouteRuntimeSlot::Idle;
}
}
@@ -124,9 +129,16 @@ impl crate::RouteRuntimeState {
};
match &inner.slot {
RouteRuntimeSlot::Active { handle, identity, .. } => std::result::Result::Ok((handle.clone(), identity.clone())),
RouteRuntimeSlot::Idle | RouteRuntimeSlot::Starting { .. } => std::result::Result::Err(ksp_core_lib::Error::new(
RouteRuntimeSlot::Idle => match &inner.last_terminal {
std::option::Option::Some(terminal) => return std::result::Result::Ok(terminal.clone()),
std::option::Option::None => std::result::Result::Err(ksp_core_lib::Error::new(
crate::ERROR_CODE_ROUTE_RUNTIME_NOT_ACTIVE,
"Raw Transaction Ingest Desk has no active mono-route Worker to stop",
)),
},
RouteRuntimeSlot::Starting { .. } => std::result::Result::Err(ksp_core_lib::Error::new(
crate::ERROR_CODE_ROUTE_RUNTIME_NOT_ACTIVE,
"Raw Transaction Ingest Desk has no active mono-route Worker to stop",
"Raw Transaction Ingest Desk mono-route Worker is still starting and cannot be stopped yet",
)),
}
};
@@ -147,7 +159,12 @@ impl crate::RouteRuntimeState {
};
let started = std::time::Instant::now();
loop {
if self.is_idle()? {
let idle = self.is_idle();
let idle = match idle {
std::result::Result::Ok(value) => value,
std::result::Result::Err(error) => return std::result::Result::Err(error),
};
if idle {
return std::result::Result::Ok(identity.dto(project_worker_state(terminal)));
}
if started.elapsed() >= ROUTE_STOP_CLEANUP_TIMEOUT {
@@ -189,7 +206,7 @@ impl crate::RouteRuntimeLaunch {
/// Waits for terminal Worker state, explicitly closes Store after the Worker releases its `Arc`, then frees the mono-route slot.
pub(crate) async fn monitor(self) {
let terminal = self.handle.wait_terminal().await;
match terminal {
let terminal_state = match terminal {
std::result::Result::Ok(state) => {
ksp_logging_lib::info!(
target: crate::TRACING_TARGET,
@@ -197,6 +214,7 @@ impl crate::RouteRuntimeLaunch {
worker_state = state.code(),
"Raw Transaction Ingest Desk mono-route Worker reached terminal state"
);
project_worker_state(state)
},
std::result::Result::Err(error) => {
ksp_logging_lib::warn!(
@@ -206,8 +224,9 @@ impl crate::RouteRuntimeLaunch {
error_code = error.code().code(),
"Raw Transaction Ingest Desk terminal Worker wait failed"
);
crate::RawIngestRouteState::Faulted
},
}
};
let close = close_store_arc(self.store).await;
if let std::result::Result::Err(error) = close {
ksp_logging_lib::warn!(
@@ -218,7 +237,9 @@ impl crate::RouteRuntimeLaunch {
"Raw Transaction Ingest Desk Store shutdown failed after terminal Worker"
);
}
self.runtime_state.finish(self.token);
let mut terminal = self.acknowledgement;
terminal.state = terminal_state;
self.runtime_state.finish(self.token, terminal);
}
}