Skip to content

add locking to resolve concurent move to trashbin conflicts - #20841

Merged
rullzer merged 1 commit into
masterfrom
trashbin-locking
May 6, 2020
Merged

add locking to resolve concurent move to trashbin conflicts#20841
rullzer merged 1 commit into
masterfrom
trashbin-locking

Conversation

@icewind1991

Copy link
Copy Markdown
Member

uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)

Signed-off-by: Robin Appelman robin@icewind.nl

@icewind1991icewind1991 added the 3. to review Waiting for reviews label May 6, 2020
@icewind1991icewind1991 added this to the Nextcloud 19 milestone May 6, 2020
@icewind1991
icewind1991force-pushed the trashbin-locking branch 2 times, most recently from aa90fb3 to 647ff66CompareMay 6, 2020 13:43

@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 👍

@rullzerrullzer mentioned this pull request May 6, 2020
3 tasks
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)
Signed-off-by: Robin Appelman <robin@icewind.nl>
@rullzer
rullzerforce-pushed the trashbin-locking branch from 647ff66 to 614acc9CompareMay 6, 2020 18:38
@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 6, 2020
@rullzer
rullzer merged commit a07c21f into masterMay 6, 2020
@rullzer
rullzer deleted the trashbin-locking branch May 6, 2020 19:50
@icewind1991

Copy link
Copy Markdown
MemberAuthor

/backport to stable18

@icewind1991

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

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 finish

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991@rullzer@MorrisJobke