Repository navigation
fix(core): keep retried files out of earlier upload batches - #6688
Open
MohammediYunus wants to merge 1 commit into
Open
MohammediYunus wants to merge 1 commit into
MohammediYunus wants to merge 1 commit into
Conversation
🦋 Changeset detectedLatest commit: 1ab9360 The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 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 |
This branch has not been deployed
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
1 participant
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.
When file B fails while file A is still uploading, retrying B clears its shared error. If A finishes first, the original batch can then report B as successful while B’s retry is still in flight.
This change transfers retried files out of earlier active batches when creating the new upload. The original result omits those files, as allowed by #5906, and the retry batch reports their outcome. Subsequent steps and final postprocessing cleanup in the original batch also exclude them.
Batches emptied by this transfer are removed, matching file-removal behavior and preventing recovery from restarting them as empty uploads. Their old custom result metadata is discarded; late addResultData calls remain safe no-ops. Uploads that intentionally start empty keep their existing behavior. This does not cancel plugin callbacks already running with a captured file list.
Resolves #5906.
Validation:
The new overlapping-retry recovery regression simulates saved Core state. The existing GoldenRetriever tests exercise browser storage recovery, but do not cover that new concurrent-retry scenario end to end. Firefox/WebKit and the complete monorepo test suite were not run.