Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable18] Fix S3 error handling #22522

Merged
merged 2 commits into from
Aug 31, 2020
Merged

[stable18] Fix S3 error handling #22522

merged 2 commits into from
Aug 31, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

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>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 18.0.10 milestone Aug 31, 2020
@rullzer rullzer added the 3. to review Waiting for reviews label Aug 31, 2020
@faily-bot
Copy link

faily-bot bot commented Aug 31, 2020

🤖 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 stable18 Aug 31, 2020
@rullzer rullzer deleted the backport/22514/stable18 branch August 31, 2020 19:44
@rullzer rullzer mentioned this pull request Sep 4, 2020
Merged
@MorrisJobke MorrisJobke mentioned this pull request Sep 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@juliushaertl juliushaertl juliushaertl approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
Nextcloud 18.0.9
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rullzer @juliushaertl