Skip to content

[stable20] dont hold a transaction during the move to trash - #23185

Merged
MorrisJobke merged 1 commit into
stable20from
backport/23109/stable20
Oct 6, 2020
Merged

[stable20] dont hold a transaction during the move to trash#23185
MorrisJobke merged 1 commit into
stable20from
backport/23109/stable20

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Oct 5, 2020

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #23109

because moving to trash can take a long time, keeping a transaction active for the duration can lead to issues
Signed-off-by: Robin Appelman <robin@icewind.nl>
@nickvergessen
nickvergessenforce-pushed the backport/23109/stable20 branch from 02f5606 to acef362CompareOctober 5, 2020 13:25

@nickvergessennickvergessen 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.

Fixed the backport

@faily-bot

faily-botBot commented Oct 5, 2020

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 33666: failure

mysql8.0-php7.2

Show full log
There was 1 error:
1) OCA\FederatedFileSharing\Tests\FederatedShareProviderTest::testCreate
OCP\Share\Exceptions\ShareNotFound: There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.
/drone/src/apps/federatedfilesharing/lib/FederatedShareProvider.php:865
/drone/src/apps/federatedfilesharing/lib/FederatedShareProvider.php:244
/drone/src/apps/federatedfilesharing/tests/FederatedShareProviderTest.php:178
--
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\DAV\Tests\unit\CardDAV\CardDavBackendTest::testSearch with data set #0 ('John', array('FN'), array(), array(array('uri0', 'John Doe'), array('uri1', 'John M. Doe')))
Failed asserting that 1 is identical to 2.
/drone/src/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php:746

@juliusknorrjuliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 6, 2020
@MorrisJobke
MorrisJobke merged commit 76fe051 into stable20Oct 6, 2020
@MorrisJobke
MorrisJobke deleted the backport/23109/stable20 branch October 6, 2020 07:10
@MorrisJobkeMorrisJobke mentioned this pull request Oct 15, 2020
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: trashbin

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@nickvergessen@juliusknorr@MorrisJobke@icewind1991