technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Wasm-wc: Fix application restarts

Browse Source 
Liam reported a problem when trying to restart wasm-wasi-component based
applications using the /control/applications/APPLICATION_NAME/restart
endpoint.

The application would become unresponsive.

What was happening was the old application process(es) weren't
exit(3)ing and so while we were starting new application processes, the
old ones were still hanging around in a non-functioning state.

When we are terminating an application it must call exit(3).

So that's what we do. We use the return value of nxt_unit_run() as the
exit status.

Due to exit(3)ing we also need to now explicitly handle the return on
error case.

Reported-by: Liam Crilly <liam@nginx.com>
Fixes: 20ada4b5c ("Wasm-wc: Core of initial Wasm component model language module support")
Closes: https://github.com/nginx/unit/issues/1179
Tested-by: Liam Crilly <liam@nginx.com>
Tested-by: Danielle De Leo <d.deleo@f5.com>
Co-developed-by: Dan Callahan <d.callahan@f5.com>
Signed-off-by: Dan Callahan <d.callahan@f5.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Andrew Clayton
2024-03-07 16:16:55 +00:00
committed by Andrei Zeliankou
parent d7ff6bb4a1
commit 777b7c8782
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/wasm-wasi-component/src/lib.rs
View File

@@ -4,6 +4,7 @@ use http_body_util::combinators::BoxBody;
use http_body_util::{BodyExt, Full}; use http_body_util::{BodyExt, Full};
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
use std::process::exit;
use std::ptr; use std::ptr;
use std::sync::OnceLock; use std::sync::OnceLock;
use tokio::sync::mpsc; use tokio::sync::mpsc;
@@ -101,7 +102,9 @@ unsafe extern "C" fn start(
task: *mut bindings::nxt_task_t, task: *mut bindings::nxt_task_t,
data: *mut bindings::nxt_process_data_t, data: *mut bindings::nxt_process_data_t,
) -> bindings::nxt_int_t { ) -> bindings::nxt_int_t {
handle_result(task, || { let mut rc: i32 = 0;
let result = handle_result(task, || {
let config = GLOBAL_CONFIG.get().unwrap(); let config = GLOBAL_CONFIG.get().unwrap();
let state = GlobalState::new(&config) let state = GlobalState::new(&config)
.context("failed to create initial state")?; .context("failed to create initial state")?;
@@ -123,11 +126,17 @@ unsafe extern "C" fn start(
bail!("nxt_unit_init() failed"); bail!("nxt_unit_init() failed");
} }
bindings::nxt_unit_run(unit_ctx); rc = bindings::nxt_unit_run(unit_ctx);
bindings::nxt_unit_done(unit_ctx); bindings::nxt_unit_done(unit_ctx);
Ok(()) Ok(())
}) });
if result != bindings::NXT_OK as bindings::nxt_int_t {
return result;
}
exit(rc);
} }
unsafe fn handle_result( unsafe fn handle_result(