fix(ObjectStore): reset multipart upload byte counter on retry - #62919
Open
ching-kuo wants to merge 1 commit into
Open
fix(ObjectStore): reset multipart upload byte counter on retry#62919ching-kuo wants to merge 1 commit into
ching-kuo wants to merge 1 commit into
Conversation
writeMultiPart() initializes $totalWritten once outside the retry loop, so bytes from a failed first attempt accumulate into the second attempt. Since $state is never resumed, each retry rewinds the stream and re-uploads the whole object from scratch, making before_complete compare roughly twice the object size against the expected size. The retry then always fails with "Incomplete multi part upload, expected X bytes, wrote 2X" and the upload is aborted. Reset the counter per attempt so the size check validates only the bytes written by the current attempt. Fixes nextcloud#59505 Signed-off-by: Ching Kuo <igene@igene.tw> Assisted-by: Claude Code:claude-fable-5
ching-kuo
requested review from
Altahrim,
nfebe,
provokateurin and
salmart-dev
and removed request for
a team
August 5, 2026 03:26
ching-kuo
force-pushed
the
fix/s3-multipart-retry-byte-count
branch
from
August 5, 2026 03:27
c0e7b6b to
db36014
Compare
CarlSchwan
approved these changes
Aug 5, 2026
Member
|
/backport to stable33 |
Member
|
/backport to stable34 |
susnux
approved these changes
Aug 5, 2026
cristianscheid
approved these changes
Aug 5, 2026
CarlSchwan
enabled auto-merge
August 5, 2026 17:07
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
4 participants
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.
Summary
writeMultiPart() initializes $totalWritten once outside the retry loop, so bytes from a failed first attempt accumulate into the second attempt. Since $state is never resumed, each retry rewinds the stream and re-uploads the whole object from scratch, making before_complete compare roughly twice the object size against the expected size. The retry then always fails with "Incomplete multi part upload, expected X bytes, wrote 2X" and the upload is aborted.
Reset the counter per attempt so the size check validates only the bytes written by the current attempt.
TODO
N/A
Checklist
3. to review, feature component)stable32)AI (if applicable)