A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Don't spawn thread-per-request in `wasmtime serve` (#11817)
Alex Crichtona246a9298abc
diff --git a/crates/test-programs/src/bin/cli_serve_sleep.rs b/crates/test-programs/src/bin/cli_serve_sleep.rsnew file mode 100644index 0000000000..c432b176a3--- /dev/null+++ b/crates/test-programs/src/bin/cli_serve_sleep.rs@@ -0,0 +1,15 @@+use test_programs::proxy;+use test_programs::wasi::http::types::{IncomingRequest, ResponseOutparam};++struct T;++proxy::export!(T);++impl proxy::exports::wasi::http::incoming_handler::Guest for T {+ fn handle(_: IncomingRequest, _outparam: ResponseOutparam) {+ std::thread::sleep(std::time::Duration::MAX);+ unreachable!()+ }+}++fn main() {}diff --git a/src/commands/serve.rs b/src/commands/serve.rsindex 7467dc4ebf..edf479d76f 100644--- a/src/commands/serve.rs+++ b/src/commands/serve.rs@@ -440,6 +440,15 @@ impl ServeCommand {log::info!("Listening on {}", self.addr);+ let epoch_interval = if let Some(Profile::Guest { interval, .. }) = self.run.profile {+ Some(interval)+ } else if let Some(t) = self.run.common.wasm.timeout {+ Some(EPOCH_INTERRUPT_PERIOD.min(t))+ } else {+ None+ };+ let _epoch_thread = epoch_interval.map(|t| EpochThread::spawn(t, engine.clone()));+let handler = ProxyHandler::new(self, engine, instance);loop {@@ -615,7 +624,7 @@ fn setup_epoch_handler(cmd: &ServeCommand,store: &mut Store<Host>,component: Component,-) -> Result<(WriteProfile, Option<EpochThread>)> {+) -> Result<WriteProfile> {// Profiling Enabledif let Some(Profile::Guest { interval, path }) = &cmd.run.profile {#[cfg(feature = "profiling")]@@ -628,22 +637,11 @@ fn setup_epoch_handler(}// Profiling disabled but there's a global request timeout- let epoch_thread = if let Some(timeout) = cmd.run.common.wasm.timeout {- let start = Instant::now();- store.epoch_deadline_callback(move |_store| {- if start.elapsed() > timeout {- bail!("Timeout expired");- }- Ok(UpdateDeadline::Continue(1))- });- store.set_epoch_deadline(1);- let engine = store.engine().clone();- Some(EpochThread::spawn(EPOCH_INTERRUPT_PERIOD, engine))- } else {- None- };+ if cmd.run.common.wasm.timeout.is_some() {+ store.epoch_deadline_async_yield_and_update(1);+ }- Ok((Box::new(|_store| {}), epoch_thread))+ Ok(Box::new(|_store| {}))}#[cfg(feature = "profiling")]@@ -653,7 +651,7 @@ fn setup_guest_profiler(path: String,interval: Duration,component: Component,-) -> Result<(WriteProfile, Option<EpochThread>)> {+) -> Result<WriteProfile> {use wasmtime::{AsContext, GuestProfiler, StoreContext, StoreContextMut};let module_name = "<main>";@@ -703,8 +701,6 @@ fn setup_guest_profiler(});store.set_epoch_deadline(1);- let engine = store.engine().clone();- let epoch_thread = Some(EpochThread::spawn(interval, engine));let write_profile = Box::new(move |store: &mut Store<Host>| {let profiler = Arc::try_unwrap(store.data_mut().guest_profiler.take().unwrap())@@ -721,7 +717,7 @@ fn setup_guest_profiler(}});- Ok((write_profile, epoch_thread))+ Ok(write_profile)}struct ProxyHandlerInner {@@ -792,8 +788,8 @@ async fn handle_request(let mut store = inner.cmd.new_store(&inner.engine, req_id)?;- let (write_profile, epoch_thread) =- setup_epoch_handler(&inner.cmd, &mut store, component.clone())?;+ let write_profile = setup_epoch_handler(&inner.cmd, &mut store, component.clone())?;+ let timeout = inner.cmd.run.common.wasm.timeout.unwrap_or(Duration::MAX);match inner.instance_pre.instantiate(&mut store).await? {Proxy::P2(proxy) => {@@ -802,17 +798,20 @@ async fn handle_request(.new_incoming_request(p2::http::types::Scheme::Http, req)?;let out = store.data_mut().new_response_outparam(sender)?;let task = tokio::task::spawn(async move {- if let Err(e) = proxy- .wasi_http_incoming_handler()- .call_handle(&mut store, req, out)- .await- {+ let result = tokio::time::timeout(+ timeout,+ proxy+ .wasi_http_incoming_handler()+ .call_handle(&mut store, req, out),+ )+ .await+ .unwrap_or_else(|_| bail!("guest timed out"));+ if let Err(e) = result {log::error!("[{req_id}] :: {e:?}");return Err(e);}write_profile(&mut store);- drop(epoch_thread);Ok(())});@@ -848,29 +847,30 @@ async fn handle_request(let (tx, rx) = tokio::sync::oneshot::channel();tokio::task::spawn(async move {- let guest_result = store- .run_concurrent(async move |store| {- let (req, body) = req.into_parts();- let body = body.map_err(ErrorCode::from_hyper_request_error);- let req = http::Request::from_parts(req, body);- let (request, request_io_result) = Request::from_http(req);- let (res, task) = proxy.handle(store, request).await??;- let res =- store.with(|mut store| res.into_http(&mut store, request_io_result))?;-- _ = tx.send(res);-- task.block(store).await;- anyhow::Ok(())- })- .await?;+ let guest_result = store.run_concurrent(async move |store| {+ let (req, body) = req.into_parts();+ let body = body.map_err(ErrorCode::from_hyper_request_error);+ let req = http::Request::from_parts(req, body);+ let (request, request_io_result) = Request::from_http(req);+ let (res, task) = proxy.handle(store, request).await??;+ let res =+ store.with(|mut store| res.into_http(&mut store, request_io_result))?;++ _ = tx.send(res);++ task.block(store).await;+ anyhow::Ok(())+ });++ let guest_result = tokio::time::timeout(timeout, guest_result)+ .await+ .unwrap_or_else(|_| bail!("guest timed out"))?;if let Err(e) = guest_result {log::error!("[{req_id}] :: {e:?}");return Err(e);}write_profile(&mut store);- drop(epoch_thread);anyhow::Ok(())});diff --git a/tests/all/cli_tests.rs b/tests/all/cli_tests.rsindex 537f1c7113..2232de824e 100644--- a/tests/all/cli_tests.rs+++ b/tests/all/cli_tests.rs@@ -2258,6 +2258,28 @@ start a print 1234server.finish()?;Ok(())}++ #[tokio::test]+ async fn cli_serve_sleep() -> Result<()> {+ let server = WasmtimeServe::new(CLI_SERVE_SLEEP_COMPONENT, |cmd| {+ cmd.arg("-Scli").arg("-Wtimeout=100us");+ })?;++ let resp = server+ .send_request(+ hyper::Request::builder()+ .uri("http://localhost/")+ .body(String::new())+ .context("failed to make request")?,+ )+ .await?;++ assert!(resp.status().is_server_error());+ let (stdout, stderr) = server.finish()?;+ assert_eq!(stdout, "");+ assert!(stderr.contains("guest timed out"), "bad stderr: {stderr}");+ Ok(())+ }}#[test]