Skip to content

[stable18] Enable fseek for files in S3 storage - #20965

Merged
MorrisJobke merged 5 commits into
stable18from
backport/20033/stable18
May 25, 2020
Merged

[stable18] Enable fseek for files in S3 storage#20965
MorrisJobke merged 5 commits into
stable18from
backport/20033/stable18

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented May 14, 2020•
edited by MorrisJobke
Loading

Copy link
Copy Markdown

backport of #20033

@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 18.0.5 milestone May 14, 2020
@MorrisJobkeMorrisJobke added 3. to review Waiting for reviews bug labels May 14, 2020
ahtiand others added 4 commits May 20, 2020 22:57
@ahti@MorrisJobke
Enable fseek for files in S3 storage
7a62514
Signed-off-by: Lukas Stabe <lukas@stabe.de>
@icewind1991@MorrisJobke
make seekable s3 stream generic
8434d0a
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991@MorrisJobke
add basic tests for s3 seeking and add some error handling if reopen …
136a716
…return the wrong range
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991@MorrisJobke
update autoloader
25f5a5e
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobke
MorrisJobkeforce-pushed the backport/20033/stable18 branch from b4c3378 to 25f5a5eCompareMay 20, 2020 20:59
@MorrisJobke

MorrisJobke commented May 20, 2020

Copy link
Copy Markdown
Member

I redid the backport manually and the conflict was only due to changed array() to [] syntax. So this is a clean backport.

MorrisJobke
MorrisJobke approved these changes May 20, 2020
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good 👍

@kesselb

kesselb commented May 20, 2020

Copy link
Copy Markdown
Contributor

I would backport #20385 as well.

@rullzerrullzer mentioned this pull request May 21, 2020
Merged
5 tasks
@icewind1991@MorrisJobke
harden seekable http stream a bit against failures
3d3ee1b
Signed-off-by: Robin Appelman <robin@icewind.nl>
@MorrisJobkeMorrisJobke mentioned this pull request May 22, 2020
Merged
@MorrisJobke

MorrisJobke commented May 22, 2020

Copy link
Copy Markdown
Member

I would backport #20385 as well.

Added to this PR as well.

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 22, 2020
@MorrisJobke
MorrisJobke merged commit 1d816ad into stable18May 25, 2020
@MorrisJobke
MorrisJobke deleted the backport/20033/stable18 branch May 25, 2020 11:38
@MorrisJobke

MorrisJobke commented May 25, 2020

Copy link
Copy Markdown
Member

/backport to stable17

@MorrisJobke

MorrisJobke commented May 25, 2020

Copy link
Copy Markdown
Member

/backport to stable17

already done in #20966

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request May 25, 2020
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@icewind1991icewind1991Awaiting requested review from icewind1991
@kesselbkesselbAwaiting requested review from kesselb
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 18.0.5

Development

Successfully merging this pull request may close these issues.

5 participants

@MorrisJobke@kesselb@rullzer@ahti@icewind1991