[Bugfix] Eliminate frontend ZMQ port TOCTOU with inherited listeners (#54113)
Signed-off-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: OpenAI Codex <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
OpenAI Codex
Claude Opus 5.5
parent
fb2ac82458
commit
f226af0e11
+10
-12
@@ -501,8 +501,8 @@ impl SharedRuntimeArgs {
|
||||
self,
|
||||
listen_fd: i32,
|
||||
grpc_listen_fd: Option<i32>,
|
||||
input_address: String,
|
||||
output_address: String,
|
||||
input_listener_fd: i32,
|
||||
output_listener_fd: i32,
|
||||
coordinator_address: Option<String>,
|
||||
engine_start_index: u32,
|
||||
engine_count: usize,
|
||||
@@ -518,8 +518,8 @@ impl SharedRuntimeArgs {
|
||||
|
||||
Config {
|
||||
transport_mode: TransportMode::Bootstrapped {
|
||||
input_address,
|
||||
output_address,
|
||||
input_listener_fd,
|
||||
output_listener_fd,
|
||||
engine_start_index,
|
||||
engine_count,
|
||||
data_parallel_size,
|
||||
@@ -697,14 +697,12 @@ pub struct FrontendArgs {
|
||||
/// supervisor. When not set, no gRPC server is started.
|
||||
#[arg(long)]
|
||||
pub grpc_listen_fd: Option<i32>,
|
||||
/// Frontend input ROUTER socket address that the Python engines will
|
||||
/// connect to.
|
||||
/// Inherited frontend input ROUTER listener file descriptor.
|
||||
#[arg(long)]
|
||||
pub input_address: String,
|
||||
/// Frontend output PULL socket address that the Python engines will push
|
||||
/// responses to.
|
||||
pub input_listener_fd: i32,
|
||||
/// Inherited frontend output PULL listener file descriptor.
|
||||
#[arg(long)]
|
||||
pub output_address: String,
|
||||
pub output_listener_fd: i32,
|
||||
/// Optional Python-owned frontend-side DP coordinator socket address for
|
||||
/// external coordinator mode in the bootstrapped frontend path, i.e.,
|
||||
/// `stats_update_address`.
|
||||
@@ -733,8 +731,8 @@ impl FrontendArgs {
|
||||
self.runtime.into_bootstrapped_config(
|
||||
self.listen_fd,
|
||||
self.grpc_listen_fd,
|
||||
self.input_address,
|
||||
self.output_address,
|
||||
self.input_listener_fd,
|
||||
self.output_listener_fd,
|
||||
self.coordinator_address,
|
||||
self.engine_start_index,
|
||||
self.engine_count,
|
||||
|
||||
@@ -668,10 +668,10 @@ fn frontend_args_json_passes_tls_into_config() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","ssl_certfile":"/tmp/cert.pem","ssl_keyfile":"/tmp/key.pem"}"#,
|
||||
])
|
||||
@@ -693,10 +693,10 @@ fn frontend_args_json_rejects_out_of_range_cert_reqs() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","ssl_certfile":"/tmp/cert.pem","ssl_cert_reqs":5}"#,
|
||||
])
|
||||
@@ -718,10 +718,10 @@ fn frontend_args_json_passes_enable_request_id_headers_into_config() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","enable_request_id_headers":true}"#,
|
||||
])
|
||||
@@ -807,10 +807,10 @@ fn frontend_args_json_passes_lora_modules_into_config() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","lora_modules":[{"name":"alice","path":"org/alice","base_model_name":null,"is_3d_lora_weight":true}]}"#,
|
||||
])
|
||||
@@ -862,10 +862,10 @@ fn frontend_args_json_accepts_api_key_string() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","api_key":"secret"}"#,
|
||||
])
|
||||
@@ -885,10 +885,10 @@ fn frontend_args_json_accepts_api_key_list() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","api_key":["secret-a","secret-b"]}"#,
|
||||
])
|
||||
@@ -991,10 +991,10 @@ fn frontend_args_accept_json() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--coordinator-address",
|
||||
"tcp://127.0.0.1:7000",
|
||||
"--args-json",
|
||||
@@ -1008,8 +1008,8 @@ fn frontend_args_accept_json() {
|
||||
FrontendArgs {
|
||||
listen_fd: 3,
|
||||
grpc_listen_fd: None,
|
||||
input_address: "ipc:///tmp/input.sock",
|
||||
output_address: "ipc:///tmp/output.sock",
|
||||
input_listener_fd: 999999,
|
||||
output_listener_fd: 999998,
|
||||
coordinator_address: Some(
|
||||
"tcp://127.0.0.1:7000",
|
||||
),
|
||||
@@ -1083,10 +1083,10 @@ fn frontend_args_json_applies_defaults() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--engine-count",
|
||||
"4",
|
||||
"--args-json",
|
||||
@@ -1115,10 +1115,10 @@ fn frontend_args_json_ignores_engine_owned_max_model_len() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","max_model_len":-1}"#,
|
||||
])
|
||||
@@ -1165,10 +1165,10 @@ fn hf_overrides_preserve_merge_patch_in_cli_and_python_bootstrap() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
&payload.to_string(),
|
||||
])
|
||||
@@ -1204,10 +1204,10 @@ fn frontend_args_json_accepts_supported_non_default_fields() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","generation_config":"vllm","revision":"release","engine_ready_timeout_secs":42,"tool_call_parser":"hermes","reasoning_parser":"qwen3_thinking","tokenizer_mode":"deepseek_v32","language_model_only":true,"max_logprobs":-1,"shutdown_timeout":3}"#,
|
||||
])
|
||||
@@ -1286,10 +1286,10 @@ fn frontend_args_json_ignores_unknown_fields() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","uds":"/tmp/vllm.sock","nested_unknown":{"x":1}}"#,
|
||||
])
|
||||
@@ -1308,10 +1308,10 @@ fn frontend_args_json_sets_prompt_tokens_details_flag() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","api_server_count":2,"enable_prompt_tokens_details":true}"#,
|
||||
])
|
||||
@@ -1371,10 +1371,10 @@ fn frontend_args_json_parses_cors_fields() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","allowed_origins":["http://a.com"],"allow_credentials":true}"#,
|
||||
])
|
||||
@@ -1396,10 +1396,10 @@ fn frontend_args_json_rejects_unsupported_fields() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","root_path":"/prefix"}"#,
|
||||
])
|
||||
@@ -1423,10 +1423,10 @@ fn frontend_args_json_aggregates_multiple_unsupported_fields() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","response_role":"assistant","root_path":"/prefix"}"#,
|
||||
])
|
||||
@@ -1452,10 +1452,10 @@ fn frontend_args_json_rejects_malformed_json() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B""#,
|
||||
])
|
||||
@@ -1999,10 +1999,10 @@ fn frontend_args_reject_legacy_handshake_flags() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B"}"#,
|
||||
"--handshake-address",
|
||||
@@ -2043,10 +2043,10 @@ fn frontend_config_uses_external_coordinator_when_coordinator_address_is_present
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--coordinator-address",
|
||||
"tcp://127.0.0.1:7000",
|
||||
"--engine-start-index",
|
||||
@@ -2068,8 +2068,8 @@ fn frontend_config_uses_external_coordinator_when_coordinator_address_is_present
|
||||
expect![[r#"
|
||||
Config {
|
||||
transport_mode: Bootstrapped {
|
||||
input_address: "ipc:///tmp/input.sock",
|
||||
output_address: "ipc:///tmp/output.sock",
|
||||
input_listener_fd: 999999,
|
||||
output_listener_fd: 999998,
|
||||
engine_start_index: 3,
|
||||
engine_count: 1,
|
||||
data_parallel_size: 4,
|
||||
@@ -2200,10 +2200,10 @@ fn frontend_config_adopts_inherited_grpc_listener() {
|
||||
"3",
|
||||
"--grpc-listen-fd",
|
||||
"4",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","grpc_port":50051}"#,
|
||||
])
|
||||
@@ -2227,10 +2227,10 @@ fn frontend_args_json_enables_profiling_when_profiler_config_set() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","profiler_config":{"profiler":"torch","torch_profiler_dir":"/tmp/profile"}}"#,
|
||||
])
|
||||
@@ -2251,10 +2251,10 @@ fn frontend_args_json_disables_profiling_when_profiler_config_absent() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B"}"#,
|
||||
])
|
||||
@@ -2275,10 +2275,10 @@ fn frontend_args_json_disables_profiling_when_profiler_type_is_null() {
|
||||
"frontend",
|
||||
"--listen-fd",
|
||||
"3",
|
||||
"--input-address",
|
||||
"ipc:///tmp/input.sock",
|
||||
"--output-address",
|
||||
"ipc:///tmp/output.sock",
|
||||
"--input-listener-fd",
|
||||
"999999",
|
||||
"--output-listener-fd",
|
||||
"999998",
|
||||
"--args-json",
|
||||
r#"{"model_tag":"Qwen/Qwen3-0.6B","profiler_config":{"profiler":null}}"#,
|
||||
])
|
||||
|
||||
@@ -18,6 +18,7 @@ futures.workspace = true
|
||||
half.workspace = true
|
||||
hex.workspace = true
|
||||
itertools.workspace = true
|
||||
libc.workspace = true
|
||||
parking_lot.workspace = true
|
||||
rmp-serde.workspace = true
|
||||
rmpv.workspace = true
|
||||
@@ -27,6 +28,7 @@ serde_json.workspace = true
|
||||
serde_repr.workspace = true
|
||||
serde_tuple.workspace = true
|
||||
serde_with.workspace = true
|
||||
socket2.workspace = true
|
||||
task-local.workspace = true
|
||||
tempfile = { workspace = true, optional = true }
|
||||
thiserror.workspace = true
|
||||
|
||||
@@ -53,16 +53,15 @@ pub enum TransportMode {
|
||||
local_output_address: Option<String>,
|
||||
},
|
||||
|
||||
/// The Python supervisor has already chosen the frontend transport
|
||||
/// addresses, and the Rust process only needs to bind them and wait for
|
||||
/// engine registration frames.
|
||||
/// The Python supervisor has already bound the frontend transport
|
||||
/// listeners. Rust adopts them and waits for engine registration frames.
|
||||
/// `EngineCoreClient::connect` consumes each descriptor exactly once;
|
||||
/// copied integer values do not create additional descriptor ownership.
|
||||
Bootstrapped {
|
||||
/// Input ROUTER socket address that engines will connect to for
|
||||
/// requests.
|
||||
input_address: String,
|
||||
/// Output PULL socket address that engines will connect to for
|
||||
/// responses.
|
||||
output_address: String,
|
||||
/// Raw input ROUTER listener descriptor inherited from the supervisor.
|
||||
input_listener_fd: i32,
|
||||
/// Raw output PULL listener descriptor inherited from the supervisor.
|
||||
output_listener_fd: i32,
|
||||
/// First data-parallel engine rank expected to register on this
|
||||
/// transport.
|
||||
engine_start_index: u32,
|
||||
@@ -336,8 +335,8 @@ impl EngineCoreClient {
|
||||
}
|
||||
|
||||
TransportMode::Bootstrapped {
|
||||
input_address,
|
||||
output_address,
|
||||
input_listener_fd,
|
||||
output_listener_fd,
|
||||
engine_start_index,
|
||||
engine_count,
|
||||
ready_timeout,
|
||||
@@ -348,8 +347,8 @@ impl EngineCoreClient {
|
||||
}
|
||||
|
||||
transport::connect_bootstrapped(
|
||||
input_address,
|
||||
output_address,
|
||||
*input_listener_fd,
|
||||
*output_listener_fd,
|
||||
*engine_start_index,
|
||||
*engine_count,
|
||||
*ready_timeout,
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
use std::convert::TryFrom;
|
||||
use std::io::Cursor;
|
||||
use std::os::fd::IntoRawFd;
|
||||
use std::os::unix::net::UnixListener;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use std::sync::Once;
|
||||
@@ -311,10 +313,17 @@ fn bootstrapped_test_config(
|
||||
client_index: u32,
|
||||
coordinator_mode: Option<CoordinatorMode>,
|
||||
) -> EngineCoreClientConfig {
|
||||
fn listener(address: &str) -> i32 {
|
||||
let path = address.strip_prefix("ipc://").expect("bootstrapped tests use IPC listeners");
|
||||
let _ = std::fs::remove_file(path);
|
||||
let listener = UnixListener::bind(path).expect("bind inherited test listener");
|
||||
listener.into_raw_fd()
|
||||
}
|
||||
|
||||
EngineCoreClientConfig {
|
||||
transport_mode: TransportMode::Bootstrapped {
|
||||
input_address,
|
||||
output_address,
|
||||
input_listener_fd: listener(&input_address),
|
||||
output_listener_fd: listener(&output_address),
|
||||
engine_start_index: 0,
|
||||
engine_count,
|
||||
data_parallel_size: engine_count,
|
||||
@@ -362,15 +371,22 @@ fn bootstrapped_test_config_with_start_index(
|
||||
|
||||
#[test]
|
||||
fn client_config_validates_bootstrapped_dp_range() {
|
||||
let mut config = bootstrapped_test_config_with_start_index(
|
||||
"ipc://unused-input".to_string(),
|
||||
"ipc://unused-output".to_string(),
|
||||
1,
|
||||
2,
|
||||
Duration::from_secs(1),
|
||||
0,
|
||||
None,
|
||||
);
|
||||
// Validation never consumes the descriptors, so placeholders avoid opening
|
||||
// listeners that nothing would close.
|
||||
let mut config = EngineCoreClientConfig {
|
||||
transport_mode: TransportMode::Bootstrapped {
|
||||
input_listener_fd: -1,
|
||||
output_listener_fd: -1,
|
||||
engine_start_index: 1,
|
||||
engine_count: 2,
|
||||
data_parallel_size: 3,
|
||||
ready_timeout: Duration::from_secs(1),
|
||||
},
|
||||
coordinator_mode: None,
|
||||
model_name: "test-model".to_string(),
|
||||
client_index: 0,
|
||||
engine_stats_enabled: true,
|
||||
};
|
||||
config.validate().expect("frontend may own a subset of global DP ranks");
|
||||
|
||||
let TransportMode::Bootstrapped {
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
use std::fmt::Debug;
|
||||
use std::ops::Deref;
|
||||
use std::os::fd::{FromRawFd, OwnedFd, RawFd};
|
||||
use std::os::unix::net::UnixListener as StdUnixListener;
|
||||
use std::time::Duration;
|
||||
|
||||
use bytes::Bytes;
|
||||
@@ -327,8 +329,8 @@ pub async fn connect_handshake(
|
||||
/// identities are synthesized from contiguous rank order instead of being
|
||||
/// discovered through a Rust-owned handshake.
|
||||
pub async fn connect_bootstrapped(
|
||||
input_address: &str,
|
||||
output_address: &str,
|
||||
input_listener_fd: RawFd,
|
||||
output_listener_fd: RawFd,
|
||||
engine_start_index: u32,
|
||||
engine_count: usize,
|
||||
ready_timeout: Duration,
|
||||
@@ -354,10 +356,16 @@ pub async fn connect_bootstrapped(
|
||||
}
|
||||
|
||||
let mut input_socket = RouterSocket::new();
|
||||
let input_address = input_socket.bind(input_address).await?.to_string();
|
||||
let input_address = input_socket
|
||||
.bind_listener(adopt_listener(input_listener_fd)?)
|
||||
.await?
|
||||
.to_string();
|
||||
|
||||
let mut output_socket = PullSocket::new();
|
||||
let output_address = output_socket.bind(output_address).await?.to_string();
|
||||
let output_address = output_socket
|
||||
.bind_listener(adopt_listener(output_listener_fd)?)
|
||||
.await?
|
||||
.to_string();
|
||||
|
||||
let engines = wait_for_input_registrations(
|
||||
&mut input_socket,
|
||||
@@ -385,6 +393,34 @@ pub async fn connect_bootstrapped(
|
||||
})
|
||||
}
|
||||
|
||||
fn adopt_listener(fd: RawFd) -> Result<zeromq::Listener> {
|
||||
if fd < 0 || unsafe { libc::fcntl(fd, libc::F_GETFD) } < 0 {
|
||||
return Err(Error::InvalidClientConfig {
|
||||
message: format!("inherited ZMQ listener fd {fd} is not open"),
|
||||
});
|
||||
}
|
||||
|
||||
// SAFETY: Python's Popen(pass_fds) gives the frontend its own descriptor.
|
||||
// The bootstrapped startup path calls this function once per descriptor,
|
||||
// transferring ownership to the listener constructed below.
|
||||
let fd = unsafe { OwnedFd::from_raw_fd(fd) };
|
||||
let socket: socket2::Socket = fd.into();
|
||||
let domain = socket.domain()?;
|
||||
|
||||
if domain == socket2::Domain::IPV4 || domain == socket2::Domain::IPV6 {
|
||||
let listener: std::net::TcpListener = socket.into();
|
||||
return Ok(listener.into());
|
||||
}
|
||||
if domain == socket2::Domain::UNIX {
|
||||
let listener: StdUnixListener = socket.into();
|
||||
return Ok(listener.into());
|
||||
}
|
||||
|
||||
Err(Error::InvalidClientConfig {
|
||||
message: format!("unsupported inherited listener domain {domain:?}"),
|
||||
})
|
||||
}
|
||||
|
||||
/// Bind new input and output sockets.
|
||||
async fn bind_local_sockets(
|
||||
local_host: &str,
|
||||
@@ -603,7 +639,12 @@ pub async fn run_output_loop(
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::bind_local_sockets;
|
||||
use std::os::fd::IntoRawFd;
|
||||
|
||||
use zeromq::RouterSocket;
|
||||
use zeromq::prelude::Socket;
|
||||
|
||||
use super::{adopt_listener, bind_local_sockets};
|
||||
|
||||
#[tokio::test]
|
||||
async fn bind_local_sockets_resolves_zero_port_bindings() {
|
||||
@@ -614,4 +655,21 @@ mod tests {
|
||||
assert!(output_address.starts_with("tcp://127.0.0.1:"));
|
||||
assert_ne!(input_address, output_address);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn inherited_tcp_listener_is_adopted_without_rebinding() {
|
||||
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).expect("bind listener");
|
||||
let expected = listener.local_addr().expect("listener address");
|
||||
let mut router = RouterSocket::new();
|
||||
|
||||
let endpoint = router
|
||||
.bind_listener(
|
||||
adopt_listener(listener.into_raw_fd()).expect("adopt inherited listener fd"),
|
||||
)
|
||||
.await
|
||||
.expect("bind inherited listener");
|
||||
|
||||
assert_eq!(endpoint.to_string(), format!("tcp://{expected}"));
|
||||
assert!(router.close().await.is_empty());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,8 @@ use std::collections::BTreeMap;
|
||||
use std::fs;
|
||||
use std::future::Future;
|
||||
use std::io;
|
||||
use std::os::fd::IntoRawFd;
|
||||
use std::os::unix::net::UnixListener;
|
||||
use std::pin::Pin;
|
||||
use std::sync::Arc;
|
||||
use std::task::{Context, Poll};
|
||||
@@ -2230,10 +2232,14 @@ async fn control_aggregates_multi_engine_capacity() {
|
||||
ready_1.world_size = 12;
|
||||
ready_1.data_parallel_rank = start_rank + 1;
|
||||
|
||||
let listener_fd = |address: &str| {
|
||||
let path = address.strip_prefix("ipc://").expect("IPC test endpoint");
|
||||
UnixListener::bind(path).expect("bind inherited test listener").into_raw_fd()
|
||||
};
|
||||
let client_config = EngineCoreClientConfig {
|
||||
transport_mode: TransportMode::Bootstrapped {
|
||||
input_address: input_address.clone(),
|
||||
output_address: output_address.clone(),
|
||||
input_listener_fd: listener_fd(&input_address),
|
||||
output_listener_fd: listener_fd(&output_address),
|
||||
engine_start_index: start_rank,
|
||||
engine_count: 2,
|
||||
data_parallel_size: global_size,
|
||||
|
||||
Reference in New Issue
Block a user