Skip to content

[stable18] Fix S3 error handling - #22522

Merged
rullzer merged 2 commits into
stable18from
backport/22514/stable18
Aug 31, 2020
Merged

[stable18] Fix S3 error handling#22522
rullzer merged 2 commits into
stable18from
backport/22514/stable18

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Aug 31, 2020

Copy link
Copy Markdown

backport of #22514

@rullzer@backportbot
Don't lose filecache entry on s3 overwrite error
f909d2a
If the object store errors we should not always delete the filecache
entry. As this might lead to people losing access to their files.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer@backportbot
Only update the filecache entry once the file has been written to S3
55ce30a
If we already update before we have no way to revert if the upload
fails.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzerrullzer added the 3. to review Waiting for reviews label Aug 31, 2020
@faily-bot

faily-botBot commented Aug 31, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 32488: failure

mariadb10.4-php7.3

Show full log
There were 2 warnings:
1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static
--
There was 1 failure:
1) OCA\Files_Sharing\Tests\SharedMountTest::testPermissionMovedGroupShare with data set #46 ('folder', 5, 19)
Failed asserting that false is true.
/drone/src/apps/files_sharing/tests/SharedMountTest.php:361

@rullzer
rullzer merged commit 3fbf45b into stable18Aug 31, 2020
@rullzer
rullzer deleted the backport/22514/stable18 branch August 31, 2020 19:44
@rullzerrullzer mentioned this pull request Sep 4, 2020
Merged
@MorrisJobkeMorrisJobke mentioned this pull request Sep 9, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@icewind1991icewind1991Awaiting requested review from icewind1991
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 18.0.9

Development

Successfully merging this pull request may close these issues.

2 participants

@rullzer@juliusknorr