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

[stable14] Unique contraint and deadlock fixes for filecache and file_locks #12433

Merged
merged 2 commits into from Nov 13, 2018

Conversation

@MorrisJobke
Member

MorrisJobke commented Nov 13, 2018

Backport of #12411 and #12413 to fix the unique constraint and deadlock issues in filecache and file_locks.

MorrisJobke added some commits Nov 12, 2018

Fix UniqueConstraintViolationException while insert into oc_filecache
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Fix UniqueConstraintViolationException while insert into oc_file_locks
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

@MorrisJobke MorrisJobke added this to the Nextcloud 14.0.4 milestone Nov 13, 2018

@MorrisJobke MorrisJobke changed the title from Backport/12411 12413/unique constraint fix to [stable14] Unique contraint and deadlock fixes for filecache and file_locks Nov 13, 2018

@MorrisJobke MorrisJobke referenced this pull request Nov 13, 2018

Merged

14.0.4 RC 1 #12436

@MorrisJobke MorrisJobke merged commit 40f5f12 into stable14 Nov 13, 2018

1 check failed

continuous-integration/drone/pr the build failed
Details

@MorrisJobke MorrisJobke deleted the backport/12411-12413/unique-constraint-fix branch Nov 13, 2018

@MorrisJobke MorrisJobke referenced this pull request Nov 22, 2018

Merged

14.0.4 #12586

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment