diff --git a/packages/paperclip-runner/runner/DURABLE_TRANSPORT.md b/packages/paperclip-runner/runner/DURABLE_TRANSPORT.md index ff9a14d0891..45f65c6dc0a 100644 --- a/packages/paperclip-runner/runner/DURABLE_TRANSPORT.md +++ b/packages/paperclip-runner/runner/DURABLE_TRANSPORT.md @@ -14,6 +14,9 @@ checks for an incoming connection every 10 ms (or sooner, when that delay is smaller). It never redials, so a connection does not wait out the reconnect delay after a disconnect or an authority rotation. +In both modes, Runner enables `TCP_NODELAY` before the WebSocket handshake +when the connected peer is on loopback. + Choose one form. Both require `PAPERCLIP_RUNNER_BOOTSTRAP_TICKET`. Recovery uses the same entry point. The Runner rejects `--source-reconcile`. diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/durable/tests/loopback_nodelay.rs b/packages/paperclip-runner/runner/crates/runner-core/src/durable/tests/loopback_nodelay.rs new file mode 100644 index 00000000000..010835d2987 --- /dev/null +++ b/packages/paperclip-runner/runner/crates/runner-core/src/durable/tests/loopback_nodelay.rs @@ -0,0 +1,47 @@ +#[test] +fn loopback_listener_enables_tcp_nodelay() { + let listener = TcpListener::bind("0.0.0.0:0").unwrap(); + listener.set_nonblocking(true).unwrap(); + let port = listener.local_addr().unwrap().port(); + let path = "/api/runner/v1/connect/run_1".to_owned(); + let stream = TcpStream::connect((Ipv4Addr::LOCALHOST, port)).unwrap(); + let client = thread::spawn({ + let url = format!("ws://127.0.0.1:{port}{path}"); + move || client(url, stream).unwrap() + }); + let endpoint = RunnerTransportEndpoint::Listen { listener, path }; + let Some(RunnerSocket::Listen(socket)) = endpoint + .open(64 * 1024, None, Instant::now() + Duration::from_secs(5)) + .unwrap() + else { + panic!("expected an accepted PRP socket"); + }; + client.join().unwrap(); + assert!(socket.get_ref().nodelay().unwrap()); +} + +#[test] +fn loopback_dial_enables_tcp_nodelay() { + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let config = config(listener.local_addr().unwrap().port()); + let endpoint = RunnerTransportEndpoint::new(&config.connect_url, &config.run_id).unwrap(); + let server = thread::spawn(move || { + let (stream, _) = listener.accept().unwrap(); + accept(stream).unwrap() + }); + let Some(RunnerSocket::Dial(socket)) = endpoint + .open( + config.max_frame_bytes, + None, + Instant::now() + Duration::from_secs(5), + ) + .unwrap() + else { + panic!("expected an outbound PRP socket"); + }; + server.join().unwrap(); + let MaybeTlsStream::Plain(stream) = socket.get_ref() else { + panic!("expected a plaintext loopback socket"); + }; + assert!(stream.nodelay().unwrap()); +} diff --git a/packages/paperclip-runner/runner/crates/runner-core/src/durable/transport.rs b/packages/paperclip-runner/runner/crates/runner-core/src/durable/transport.rs index fe648064c29..d777483b000 100644 --- a/packages/paperclip-runner/runner/crates/runner-core/src/durable/transport.rs +++ b/packages/paperclip-runner/runner/crates/runner-core/src/durable/transport.rs @@ -289,7 +289,7 @@ impl RunnerTransportEndpoint { let deadline = bounded_operation_deadline(connect_deadline, AUTH_TIMEOUT)?; let connector = ca_bundle_path.map(custom_tls_connector).transpose()?; ensure_connection_deadline(deadline)?; - stream.set_nonblocking(true).map_err(|error| { + configure_prp_tcp_stream(&stream).map_err(|error| { DurableRunnerError::invalid(format!( "WebSocket stream configuration failed: {error}" )) @@ -336,7 +336,7 @@ impl RunnerTransportEndpoint { ))) } }; - stream.set_nonblocking(true).map_err(|error| { + configure_prp_tcp_stream(&stream).map_err(|error| { DurableRunnerError::invalid(format!( "runner ingress stream configuration failed: {error}" )) @@ -393,6 +393,13 @@ impl RunnerTransportEndpoint { } } +fn configure_prp_tcp_stream(stream: &TcpStream) -> io::Result<()> { + if stream.peer_addr()?.ip().is_loopback() { + stream.set_nodelay(true)?; + } + stream.set_nonblocking(true) +} + fn validate_listener_authority(authority: &str) -> Result { let address: SocketAddr = authority.parse().map_err(|_| { DurableRunnerError::invalid( @@ -1775,6 +1782,7 @@ mod tests { include!("tests/acpx_park_relaunch.rs"); include!("tests/ack_release_poll.rs"); include!("tests/indeterminate_terminal_ack.rs"); + include!("tests/loopback_nodelay.rs"); use std::net::{IpAddr, Ipv4Addr, TcpListener}; use std::path::PathBuf;