diff --git a/control_plane/src/background_process.rs b/control_plane/src/background_process.rs index 3840e3cd08..34b5609d3a 100644 --- a/control_plane/src/background_process.rs +++ b/control_plane/src/background_process.rs @@ -209,7 +209,14 @@ pub fn stop_process(immediate: bool, process_name: &str, pid_file: &Path) -> any } fn fill_rust_env_vars(cmd: &mut Command) -> &mut Command { - let mut filled_cmd = cmd.env_clear().env("RUST_BACKTRACE", "1"); + // If RUST_BACKTRACE is set, pass it through. But if it's not set, default + // to RUST_BACKTRACE=1. + let backtrace_setting = std::env::var_os("RUST_BACKTRACE"); + let backtrace_setting = backtrace_setting + .as_deref() + .unwrap_or_else(|| OsStr::new("1")); + + let mut filled_cmd = cmd.env_clear().env("RUST_BACKTRACE", backtrace_setting); // Pass through these environment variables to the command for var in ["LLVM_PROFILE_FILE", "FAILPOINTS", "RUST_LOG"] { diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index 943794ae8f..11d4a202ca 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -625,7 +625,6 @@ async fn tenant_create_handler(mut request: Request) -> Result