Uh oh!
There was an error while loading. Please reload this page.
fix(S3): Only append streams if non-seekable - #55654
Merged
Merged
Conversation
artonge
requested review from
Altahrim, provokateurin and salmart-dev
and removed request for
a teamOctober 9, 2025 15:44
artonge
commented
Oct 9, 2025
CollaboratorAuthor
/backport to stable32 |
artonge
commented
Oct 9, 2025
CollaboratorAuthor
/backport to stable31 |
artonge
commented
Oct 9, 2025
CollaboratorAuthor
/backport to stable30 |
icewind1991
requested changes
Oct 9, 2025
icewind1991
left a comment
Member
There was a problem hiding this comment.
It should check that the stream is seekable.
If it isn't then the retry will fail anyway so the current logic would work for that
artongeforce-pushed
the
artonge/fix/do_not_happen_streams
branch
from
October 9, 2025 15:56
8f43415 to
adc45bfCompareartongeforce-pushed
the
artonge/fix/do_not_happen_streams
branch
from
October 9, 2025 16:15
adc45bf to
c02e47aCompareUh oh!
There was an error while loading. Please reload this page.
provokateurin
approved these changes
Oct 9, 2025
Later, when we rewind the stream in `writeMultiPart` during retry, both streams were rewinded, so the resulting stream was bigger than expected. Inspired by https://github.com/aws/aws-sdk-php/blob/master/src/S3/ObjectUploader.php#L136-L146 Signed-off-by: Louis Chmn <louis@chmn.me>
artongeforce-pushed
the
artonge/fix/do_not_happen_streams
branch
from
October 10, 2025 07:54
c02e47a to
00ec57eCompareleftybournes
approved these changes
Oct 10, 2025
icewind1991
approved these changes
Oct 10, 2025
Uh oh!
There was an error while loading. Please reload this page.
The backport to # Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/55654/stable30
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts, resolve them
git cherry-pick 00ec57ef
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/55654/stable30Error: Failed to check for changes with origin/stable30: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
This was referenced Oct 10, 2025
Merged
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 freeto 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.
Later, when we rewind the stream in
writeMultiPartduring retry, both streams were rewinded, so the resulting stream was bigger than expected.Inspired by https://github.com/aws/aws-sdk-php/blob/master/src/S3/ObjectUploader.php#L136-L146