mirror of
https://github.com/openai/codex.git
synced 2026-09-06 15:29:32 +00:00
## Why Timing out a Git metadata command must not leave helper processes running after the command wrapper exits. ## What changed - Run Git metadata commands in a dedicated process group on Unix and a Job Object on Windows so timeout cleanup terminates their full process trees. - Start Windows commands suspended, assign them to the Job Object, and then resume them so immediate descendants cannot escape containment. - Preserve descendants when a Git command completes normally, and retain the existing direct-spawn fallback if Windows Job Object setup fails. ## Testing Added cross-platform regression tests for cleanup both while the command wrapper is running and after it exits, plus Windows coverage for immediate-child Job Object containment. GitOrigin-RevId: 351851708e23ff06b89fe1894bd09a3558f67293
135 lines
5.7 KiB
Rust
135 lines
5.7 KiB
Rust
use super::spawn_git_command;
|
|
use super::wait_for_git_command_with_timeout_output;
|
|
use pretty_assertions::assert_eq;
|
|
#[cfg(windows)]
|
|
use std::process::Stdio;
|
|
use std::time::Duration;
|
|
use tokio::process::Command;
|
|
|
|
#[derive(Clone, Copy)]
|
|
enum GitWrapperLifetime {
|
|
WaitForChild,
|
|
ExitBeforeTimeout,
|
|
}
|
|
|
|
async fn assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
wrapper_lifetime: GitWrapperLifetime,
|
|
) {
|
|
let temp_dir = tempfile::tempdir().expect("create temp dir");
|
|
let child_pid_file = temp_dir.path().join("child.pid");
|
|
let child_ready_file = temp_dir.path().join("child-ready");
|
|
let release_child_file = temp_dir.path().join("release-child");
|
|
let child_survived_file = temp_dir.path().join("child-survived");
|
|
let release_wrapper_file = temp_dir.path().join("release-wrapper");
|
|
#[cfg(unix)]
|
|
let mut command = {
|
|
let mut command = Command::new("/bin/sh");
|
|
let wrapper_command = match wrapper_lifetime {
|
|
GitWrapperLifetime::WaitForChild => {
|
|
r#"( : > "$CHILD_READY_FILE"; while [ ! -f "$RELEASE_CHILD_FILE" ]; do sleep 0.01; done; sleep 1; : > "$CHILD_SURVIVED_FILE"; sleep 60 ) & child_pid=$!; printf '%s\n' "$child_pid" > "$CHILD_PID_FILE"; wait "$child_pid""#
|
|
}
|
|
GitWrapperLifetime::ExitBeforeTimeout => {
|
|
r#"( : > "$CHILD_READY_FILE"; while [ ! -f "$RELEASE_CHILD_FILE" ]; do sleep 0.01; done; sleep 1; : > "$CHILD_SURVIVED_FILE"; sleep 60 ) & child_pid=$!; printf '%s\n' "$child_pid" > "$CHILD_PID_FILE"; while [ ! -f "$RELEASE_WRAPPER_FILE" ]; do sleep 0.01; done"#
|
|
}
|
|
};
|
|
command.args(["-c", wrapper_command]);
|
|
command
|
|
};
|
|
#[cfg(windows)]
|
|
let mut command = {
|
|
let mut command = Command::new("powershell.exe");
|
|
let child_command = "Set-Content -LiteralPath $env:CHILD_READY_FILE -Value ready; while (-not (Test-Path $env:RELEASE_CHILD_FILE)) { Start-Sleep -Milliseconds 25 }; Start-Sleep -Seconds 1; Set-Content -LiteralPath $env:CHILD_SURVIVED_FILE -Value survived; Start-Sleep -Seconds 60";
|
|
let wrapper_command = match wrapper_lifetime {
|
|
GitWrapperLifetime::WaitForChild => format!(
|
|
"$child = Start-Process -FilePath powershell.exe -ArgumentList @('-NoProfile', '-NonInteractive', '-Command', '{child_command}') -PassThru -NoNewWindow; [System.IO.File]::WriteAllText($env:CHILD_PID_FILE, [string]$child.Id); Wait-Process -Id $child.Id"
|
|
),
|
|
GitWrapperLifetime::ExitBeforeTimeout => format!(
|
|
"$child = Start-Process -FilePath powershell.exe -ArgumentList @('-NoProfile', '-NonInteractive', '-Command', '{child_command}') -PassThru -NoNewWindow; [System.IO.File]::WriteAllText($env:CHILD_PID_FILE, [string]$child.Id); while (-not (Test-Path $env:RELEASE_WRAPPER_FILE)) {{ Start-Sleep -Milliseconds 25 }}"
|
|
),
|
|
};
|
|
command
|
|
.args(["-NoProfile", "-NonInteractive", "-Command"])
|
|
.arg(wrapper_command);
|
|
command
|
|
};
|
|
command
|
|
.env("CHILD_PID_FILE", &child_pid_file)
|
|
.env("CHILD_READY_FILE", &child_ready_file)
|
|
.env("RELEASE_CHILD_FILE", &release_child_file)
|
|
.env("CHILD_SURVIVED_FILE", &child_survived_file)
|
|
.env("RELEASE_WRAPPER_FILE", &release_wrapper_file);
|
|
|
|
let (mut wrapper, process_tree) = spawn_git_command(&mut command).expect("spawn Git wrapper");
|
|
let child_pid = tokio::time::timeout(Duration::from_secs(30), async {
|
|
loop {
|
|
if let Ok(child_pid) = std::fs::read_to_string(&child_pid_file)
|
|
&& !child_pid.trim().is_empty()
|
|
&& child_ready_file.exists()
|
|
{
|
|
break child_pid.trim().to_string();
|
|
}
|
|
tokio::time::sleep(Duration::from_millis(25)).await;
|
|
}
|
|
})
|
|
.await
|
|
.expect("wait for Git wrapper child readiness");
|
|
|
|
if matches!(wrapper_lifetime, GitWrapperLifetime::ExitBeforeTimeout) {
|
|
std::fs::write(&release_wrapper_file, "release").expect("release Git wrapper");
|
|
tokio::time::timeout(Duration::from_secs(10), async {
|
|
loop {
|
|
if wrapper
|
|
.try_wait()
|
|
.expect("check Git wrapper state")
|
|
.is_some()
|
|
{
|
|
break;
|
|
}
|
|
tokio::time::sleep(Duration::from_millis(25)).await;
|
|
}
|
|
})
|
|
.await
|
|
.expect("wait for Git wrapper exit");
|
|
}
|
|
|
|
let output =
|
|
wait_for_git_command_with_timeout_output(wrapper, process_tree, Duration::from_millis(100))
|
|
.await;
|
|
assert_eq!(output, None);
|
|
|
|
std::fs::write(&release_child_file, "release").expect("release Git wrapper child");
|
|
tokio::time::sleep(Duration::from_secs(3)).await;
|
|
if !child_survived_file.exists() {
|
|
return;
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
let _ = std::process::Command::new("kill")
|
|
.args(["-KILL", &child_pid])
|
|
.status();
|
|
#[cfg(windows)]
|
|
let _ = std::process::Command::new("taskkill")
|
|
.args(["/PID", &child_pid, "/T", "/F"])
|
|
.stdin(Stdio::null())
|
|
.stdout(Stdio::null())
|
|
.stderr(Stdio::null())
|
|
.status();
|
|
panic!("Git wrapper child process {child_pid} survived timeout cleanup");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn timed_out_git_wrapper_does_not_leave_child_process_running() {
|
|
assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
GitWrapperLifetime::WaitForChild,
|
|
)
|
|
.await;
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn timed_out_exited_git_wrapper_does_not_leave_child_process_running() {
|
|
assert_timed_out_git_wrapper_does_not_leave_child_process_running(
|
|
GitWrapperLifetime::ExitBeforeTimeout,
|
|
)
|
|
.await;
|
|
}
|