Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Retry file blob uploads on HTTP 502 and 504 (#47926)

mtsui-oai0037b39cc1d5
diff --git a/codex-rs/codex-api/src/files.rs b/codex-rs/codex-api/src/files.rs
index 84564fb7ad..2534516b60 100644
--- a/codex-rs/codex-api/src/files.rs
+++ b/codex-rs/codex-api/src/files.rs
@@ -291,7 +291,12 @@ where
azure_request_id: azure_request_id.clone(),
azure_error_code: azure_error_code.clone(),
},
- upload_status == StatusCode::SERVICE_UNAVAILABLE,
+ matches!(
+ upload_status,
+ StatusCode::BAD_GATEWAY
+ | StatusCode::SERVICE_UNAVAILABLE
+ | StatusCode::GATEWAY_TIMEOUT
+ ),
"http_status",
)
}
diff --git a/codex-rs/codex-api/src/files_retry_tests.rs b/codex-rs/codex-api/src/files_retry_tests.rs
index 037ae3615f..bc8e6e3246 100644
--- a/codex-rs/codex-api/src/files_retry_tests.rs
+++ b/codex-rs/codex-api/src/files_retry_tests.rs
@@ -50,12 +50,21 @@ async fn mock_upload(
}
#[tokio::test]
-async fn retries_503_within_budget_but_not_4xx() {
+async fn retries_transient_upload_statuses_within_budget() {
for (statuses, azure_code, retry_after) in [
- (vec![503, 200], "ServerBusy", None),
- (vec![503; 5], "ServerBusy", None),
- (vec![403], "AuthenticationFailed", None),
- (vec![503], "ServerBusy", Some("301")),
+ (vec![502, 200], None, None),
+ (vec![503, 200], Some("ServerBusy"), None),
+ (vec![504, 200], None, None),
+ (vec![502, 504, 503, 200], None, None),
+ (vec![502; 5], None, None),
+ (vec![503; 5], Some("ServerBusy"), None),
+ (vec![504; 5], None, None),
+ (vec![403], Some("AuthenticationFailed"), None),
+ (vec![409], None, None),
+ (vec![500], None, None),
+ (vec![502], None, Some("301")),
+ (vec![503], Some("ServerBusy"), Some("301")),
+ (vec![504], None, Some("301")),
] {
let server = MockServer::start().await;
let attempts = statuses.len();
@@ -71,7 +80,10 @@ async fn retries_503_within_budget_but_not_4xx() {
Some(delay) => response.insert_header("retry-after", delay),
None => response.insert_header("x-ms-retry-after-ms", "0"),
};
- response.insert_header("x-ms-error-code", azure_code)
+ match azure_code {
+ Some(code) => response.insert_header("x-ms-error-code", code),
+ None => response,
+ }
},
attempts as u64,
u64::from(succeeds),
@@ -97,7 +109,7 @@ async fn retries_503_within_budget_but_not_4xx() {
if let Err(error) = result {
let message = error.to_string();
assert!(message.contains(&format!("azure_request_id=request-{}", attempts - 1)));
- assert!(message.contains(azure_code));
+ assert!(message.contains(azure_code.unwrap_or("missing")));
assert!(!format!("{error:?}").contains("sig=secret"));
}
let requests = server.received_requests().await.expect("requests");