[Feature][Rust Frontend] Add Shutdown control RPC (#59316)
Co-authored-by: Bugen Zhao <i@bugenzhao.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Julien Darve <jdarve@NVIDIA.com> Signed-off-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
co-authored by
Bugen Zhao
Claude Opus 5.5
parent
b22494cc0c
commit
f28a508162
@@ -557,6 +557,8 @@ impl SharedRuntimeArgs {
|
||||
disable_log_stats: self.disable_log_stats,
|
||||
grpc_port: self.grpc_port,
|
||||
shutdown_timeout,
|
||||
// The engine is launched and supervised by another process.
|
||||
manages_engine: false,
|
||||
keep_alive_timeout,
|
||||
profiler,
|
||||
}
|
||||
@@ -572,6 +574,7 @@ impl SharedRuntimeArgs {
|
||||
engine_count: usize,
|
||||
local_input_address: Option<String>,
|
||||
local_output_address: Option<String>,
|
||||
manages_engine: bool,
|
||||
) -> Config {
|
||||
let ready_timeout = self.ready_timeout();
|
||||
let shutdown_timeout = self.shutdown_timeout();
|
||||
@@ -615,6 +618,7 @@ impl SharedRuntimeArgs {
|
||||
disable_log_stats: self.disable_log_stats,
|
||||
grpc_port: self.grpc_port,
|
||||
shutdown_timeout,
|
||||
manages_engine,
|
||||
keep_alive_timeout,
|
||||
profiler,
|
||||
}
|
||||
@@ -793,6 +797,8 @@ impl ServeArgs {
|
||||
self.managed_engine.data_parallel_size,
|
||||
local_input_address,
|
||||
local_output_address,
|
||||
// `--data-parallel-size-local 0` runs the frontend without a local engine.
|
||||
self.managed_engine.data_parallel_size_local != Some(0),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -1889,6 +1889,7 @@ fn serve_frontend_config_uses_dp_address_as_advertised_host() {
|
||||
disable_log_stats: false,
|
||||
grpc_port: None,
|
||||
shutdown_timeout: 0ns,
|
||||
manages_engine: true,
|
||||
keep_alive_timeout: 5s,
|
||||
profiler: None,
|
||||
}
|
||||
@@ -1983,6 +1984,7 @@ fn serve_frontend_config_keeps_tcp_transport_for_non_local_only_topology() {
|
||||
disable_log_stats: false,
|
||||
grpc_port: None,
|
||||
shutdown_timeout: 0ns,
|
||||
manages_engine: true,
|
||||
keep_alive_timeout: 5s,
|
||||
profiler: None,
|
||||
}
|
||||
@@ -2011,6 +2013,29 @@ fn frontend_args_reject_legacy_handshake_flags() {
|
||||
assert!(error.to_string().contains("--handshake-address"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn serve_frontend_config_does_not_manage_engine_without_local_engines() {
|
||||
let cli = Cli::try_parse_from([
|
||||
"vllm-rs",
|
||||
"serve",
|
||||
"Qwen/Qwen3-0.6B",
|
||||
"--data-parallel-address",
|
||||
"10.99.48.128",
|
||||
"--data-parallel-size",
|
||||
"2",
|
||||
"--data-parallel-size-local",
|
||||
"0",
|
||||
])
|
||||
.unwrap();
|
||||
|
||||
let Command::Serve(args) = cli.command else {
|
||||
panic!("expected serve args");
|
||||
};
|
||||
let config = args.to_frontend_config("tcp://10.99.48.128:29550".to_string());
|
||||
|
||||
assert!(!config.manages_engine);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn frontend_config_uses_external_coordinator_when_coordinator_address_is_present() {
|
||||
let cli = Cli::try_parse_from([
|
||||
@@ -2098,6 +2123,7 @@ fn frontend_config_uses_external_coordinator_when_coordinator_address_is_present
|
||||
disable_log_stats: false,
|
||||
grpc_port: None,
|
||||
shutdown_timeout: 0ns,
|
||||
manages_engine: false,
|
||||
keep_alive_timeout: 5s,
|
||||
profiler: None,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user