uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-23 00:21:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

kernel: only reboot persisted processes if their OnExit behavior is not None

Browse Source
This commit is contained in:
dr-frmr 2024-03-14 01:00:40 -03:00
parent fccff76023
commit 6082ee6533
No known key found for this signature in database
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
kinode/src/kernel/mod.rs
View File

@ -716,18 +716,19 @@ pub async fn kernel(
let mut is_debug: bool = false; let mut is_debug: bool = false;
let mut reboot_processes: Vec<(t::ProcessId, StartProcessMetadata, Vec<u8>)> = vec![]; let mut reboot_processes: Vec<(t::ProcessId, StartProcessMetadata, Vec<u8>)> = vec![];
// filter out OnExit::None processes from process_map
process_map.retain(|_, persisted| !persisted.on_exit.is_none());
for (process_id, persisted) in &process_map { for (process_id, persisted) in &process_map {
// runtime extensions will have a bytes_handle of "", because they have no // runtime extensions will have a bytes_handle of "", because they have no
// WASM code saved in filesystem. // WASM code saved in filesystem.
if persisted.on_exit.is_restart() && !persisted.wasm_bytes_handle.is_empty() { if persisted.wasm_bytes_handle.is_empty() {
// read wasm bytes directly from vfs continue;
// start process. }
let wasm_bytes = match tokio::fs::read(format!( // read wasm bytes directly from vfs
"{}/{}", // start process.
vfs_path, persisted.wasm_bytes_handle let wasm_bytes =
)) match tokio::fs::read(format!("{}/{}", vfs_path, persisted.wasm_bytes_handle)).await {
.await
{
Ok(bytes) => bytes, Ok(bytes) => bytes,
Err(e) => { Err(e) => {
let _ = send_to_terminal let _ = send_to_terminal
@ -742,20 +743,19 @@ pub async fn kernel(
continue; continue;
} }
}; };
reboot_processes.push(( reboot_processes.push((
process_id.clone(), process_id.clone(),
StartProcessMetadata { StartProcessMetadata {
source: t::Address { source: t::Address {
node: our.name.clone(), node: our.name.clone(),
process: KERNEL_PROCESS_ID.clone(), process: KERNEL_PROCESS_ID.clone(),
},
process_id: process_id.clone(),
persisted: persisted.clone(),
reboot: true,
}, },
wasm_bytes, process_id: process_id.clone(),
)); persisted: persisted.clone(),
} reboot: true,
},
wasm_bytes,
));
if let t::OnExit::Requests(requests) = &persisted.on_exit { if let t::OnExit::Requests(requests) = &persisted.on_exit {
// if a persisted process had on-death-requests, we should perform them now // if a persisted process had on-death-requests, we should perform them now
// even in death, a process can only message processes it has capabilities for // even in death, a process can only message processes it has capabilities for

8
lib/src/core.rs
View File

@ -483,6 +483,14 @@ impl OnExit {
} }
} }
pub fn is_none(&self) -> bool {
match self {
OnExit::None => true,
OnExit::Restart => false,
OnExit::Requests(_) => false,
}
}
pub fn en_wit(&self) -> wit::OnExit { pub fn en_wit(&self) -> wit::OnExit {
match self { match self {
OnExit::None => wit::OnExit::None, OnExit::None => wit::OnExit::None,