[deploy-helpers] respect Retry-After during asset uploads - #15632
Open
petebacondarwin wants to merge 6 commits into
Open
[deploy-helpers] respect Retry-After during asset uploads#15632petebacondarwin wants to merge 6 commits into
petebacondarwin wants to merge 6 commits into
Conversation
🦋 Changeset detectedLatest commit: eaab2b4 The changes in this PR will be included in the next version bump. This PR includes changesets to release 5 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Contributor
|
LGTM! |
@cloudflare/autoconfig
@cloudflare/build-output-utils
@cloudflare/codemods
@cloudflare/config
@cloudflare/containers-shared
create-cloudflare
@cloudflare/deploy-helpers
@cloudflare/kv-asset-handler
miniflare
@cloudflare/pages-functions
@cloudflare/pages-shared
@cloudflare/unenv-preset
@cloudflare/vite-plugin
@cloudflare/vitest-plugin
@cloudflare/workers-auth
@cloudflare/workers-editor-shared
@cloudflare/workers-utils
wrangler
commit: |
petebacondarwin
force-pushed
the
fix/asset-upload-retry-after
branch
from
September 13, 2026 12:46
e6494f9 to
a3bf57a
Compare
Base automatically changed from
fix/asset-upload-concurrency-recovery
to
main
September 14, 2026 12:52
workers-devprod
requested review from
a team and
dario-piotrowicz
and removed request for
a team
September 14, 2026 12:53
Contributor
|
Codeowners approval required for this PR:
Show detailed file reviewers
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Partially addresses #15060.
Stacked on #15631. This PR should be reviewed as the single follow-up commit on top of that change.
The fetch layer already exposes
Retry-AfterasAPIError.retryAfterMs, but the static asset upload loop ignored it and retried using its own short exponential/gateway delays. A response such asRetry-After: 120could therefore be retried after only a few seconds, adding more load while the asset service was asking the client to pause.This change:
Retry-Afterdeadline;Retry-Afterprecedence over the local retry delays instead of stacking both waits;setTimeoutclamp.The tests simulate a 120-second directive without waiting in real time. They verify that neither the failed request nor queued assets restart early, that simultaneous 524 retries remain serialized after the pause, and that concurrency subsequently recovers.
Scope: this covers Workers static asset upload requests handled by
syncAssets(). Retry handling for the initialassets-upload-sessionrequest and the separate Pages/pages/assets/uploadpath is unchanged and can be addressed independently.Note
This is a contribution from an AI agent: OpenAI Codex (GPT-5).