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.

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

add locking to resolve concurent move to trashbin conflicts #20841

Merged
merged 1 commit into from
May 6, 2020

Conversation

icewind1991
Copy link
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

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label May 6, 2020
@icewind1991 icewind1991 added this to the Nextcloud 19 milestone May 6, 2020
@icewind1991 icewind1991 force-pushed the trashbin-locking branch 2 times, most recently from aa90fb3 to 647ff66 Compare May 6, 2020 13:43
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Code looks good 👍

@rullzer rullzer 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 rullzer force-pushed the trashbin-locking branch from 647ff66 to 614acc9 Compare May 6, 2020 18:38
@MorrisJobke MorrisJobke 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 master May 6, 2020
@rullzer rullzer deleted the trashbin-locking branch May 6, 2020 19:50
@icewind1991
Copy link
Member Author

/backport to stable18

@icewind1991
Copy link
Member Author

/backport to stable17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready 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