Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Raise the managed app-server file descriptor limit on Unix (#51470)

Eric Traut8519cde1badf
diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock
index a5f9b84444..890890f9a9 100644
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -2152,6 +2152,7 @@ dependencies = [
"hmac 0.12.1",
"http 1.4.0",
"keyring",
+ "libc",
"opentelemetry",
"opentelemetry_sdk",
"pretty_assertions",
diff --git a/codex-rs/app-server/Cargo.toml b/codex-rs/app-server/Cargo.toml
index 12418814aa..0ef30505cc 100644
--- a/codex-rs/app-server/Cargo.toml
+++ b/codex-rs/app-server/Cargo.toml
@@ -123,6 +123,9 @@ uuid = { workspace = true, features = ["serde", "v7"] }
[target.'cfg(all(target_os = "linux", target_env = "musl", any(target_arch = "x86_64", target_arch = "aarch64")))'.dependencies]
tikv-jemallocator = { workspace = true }
+[target.'cfg(unix)'.dependencies]
+libc = { workspace = true }
+
[target.'cfg(windows)'.dependencies]
codex-windows-sandbox = { workspace = true }
diff --git a/codex-rs/app-server/src/lib.rs b/codex-rs/app-server/src/lib.rs
index 08ebe50862..896aa6623b 100644
--- a/codex-rs/app-server/src/lib.rs
+++ b/codex-rs/app-server/src/lib.rs
@@ -122,6 +122,8 @@ mod gateway_oauth_notifications;
mod image_url;
pub mod in_process;
mod log_write_warning;
+#[cfg(unix)]
+mod managed_daemon;
mod mcp_refresh;
mod message_processor;
mod model_catalog;
@@ -504,6 +506,10 @@ pub async fn run_main_with_transport_options(
) -> IoResult<AppServerExit> {
#[cfg(target_os = "windows")]
let _registered_core = codex_windows_sandbox::registered_core_requested();
+ let managed_daemon = matches!(&transport, AppServerTransport::UnixSocket { .. })
+ && runtime_options.managed_daemon;
+ #[cfg(unix)]
+ let nofile_limit_result = managed_daemon.then(managed_daemon::raise_nofile_limit);
let loader_overrides = loader_overrides_with_test_user_config_file(
loader_overrides,
test_user_config_file_from_env(),
@@ -747,6 +753,10 @@ pub async fn run_main_with_transport_options(
.with(log_db_layer)
.with(otel_layers)
.try_init();
+ #[cfg(unix)]
+ if let Some(Err(err)) = nofile_limit_result {
+ warn!(%err, "failed to raise managed app-server file descriptor limit");
+ }
for warning in &config_warnings {
match &warning.details {
Some(details) => error!("{} {}", warning.summary, details),
@@ -784,8 +794,6 @@ pub async fn run_main_with_transport_options(
let single_client_mode = matches!(&transport, AppServerTransport::Stdio);
let graceful_signal_restart_enabled =
runtime_options.install_shutdown_signal_handler && !single_client_mode;
- let managed_daemon = matches!(&transport, AppServerTransport::UnixSocket { .. })
- && runtime_options.managed_daemon;
let mut app_server_client_name_rx = None;
match &transport {
diff --git a/codex-rs/app-server/src/managed_daemon.rs b/codex-rs/app-server/src/managed_daemon.rs
new file mode 100644
index 0000000000..8bf0c5c9d7
--- /dev/null
+++ b/codex-rs/app-server/src/managed_daemon.rs
@@ -0,0 +1,26 @@
+//! Unix process setup specific to a managed app-server daemon.
+
+use std::io;
+
+const NOFILE_LIMIT: libc::rlim_t = 4096;
+
+pub(crate) fn raise_nofile_limit() -> io::Result<()> {
+ let mut limit = libc::rlimit {
+ rlim_cur: 0,
+ rlim_max: 0,
+ };
+ // SAFETY: getrlimit initializes the stack-owned resource-limit structure.
+ if unsafe { libc::getrlimit(libc::RLIMIT_NOFILE, &raw mut limit) } == -1 {
+ return Err(io::Error::last_os_error());
+ }
+ let target = limit.rlim_cur.max(limit.rlim_max.min(NOFILE_LIMIT));
+ if target == limit.rlim_cur {
+ return Ok(());
+ }
+ limit.rlim_cur = target;
+ // SAFETY: the requested soft limit does not exceed the inherited hard limit.
+ if unsafe { libc::setrlimit(libc::RLIMIT_NOFILE, &limit) } == -1 {
+ return Err(io::Error::last_os_error());
+ }
+ Ok(())
+}