clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

exec: timeout on grandchildren

Browse Source 
We were enforcing the 10 s wall-clock limit only on the child process.
If that child (bash) spawns grandchildren and we kill it on timeout, those
grandchildren still have the original stdout/err pipe open, so the background
tasks that are draining the pipes block forever
This commit is contained in:
Misha Davidov
2025-08-04 15:35:15 -07:00
parent ab76bfbe75
commit 8782704b0d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
codex-rs/core/src/exec.rs
View File

@@ -365,7 +365,7 @@ pub(crate) async fn consume_truncated_output(
join_res = &mut *handle => {
match join_res {
Ok(io_res) => io_res,
Err(join_err) => Err(std::io::Error::new(std::io::ErrorKind::Other, join_err)),
Err(join_err) => Err(std::io::Error::other(join_err)),
}
},
_ = tokio::time::sleep(timeout) => {
@@ -378,8 +378,16 @@ pub(crate) async fn consume_truncated_output(
let mut stdout_handle = stdout_handle;
let mut stderr_handle = stderr_handle;
let stdout = await_with_timeout(&mut stdout_handle, Duration::from_millis(IO_DRAIN_TIMEOUT_MS)).await?;
let stderr = await_with_timeout(&mut stderr_handle, Duration::from_millis(IO_DRAIN_TIMEOUT_MS)).await?;
let stdout = await_with_timeout(
&mut stdout_handle,
Duration::from_millis(IO_DRAIN_TIMEOUT_MS),
)
.await?;
let stderr = await_with_timeout(
&mut stderr_handle,
Duration::from_millis(IO_DRAIN_TIMEOUT_MS),
)
.await?;
Ok(RawExecToolCallOutput {
exit_status,