Skip to content

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

Merged
MorrisJobke merged 2 commits into
stable14from
backport/12411-12413/unique-constraint-fix
Nov 13, 2018
Merged

[stable14] Unique contraint and deadlock fixes for filecache and file_locks#12433
MorrisJobke merged 2 commits into
stable14from
backport/12411-12413/unique-constraint-fix

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

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

* 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>
* 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>
@MorrisJobkeMorrisJobke added the 3. to review Waiting for reviews label Nov 13, 2018
@MorrisJobkeMorrisJobke added this to the Nextcloud 14.0.4 milestone Nov 13, 2018
@MorrisJobkeMorrisJobke changed the title Backport/12411 12413/unique constraint fix[stable14] Unique contraint and deadlock fixes for filecache and file_locksNov 13, 2018
@MorrisJobkeMorrisJobke mentioned this pull request Nov 13, 2018
@MorrisJobke
MorrisJobke merged commit 40f5f12 into stable14Nov 13, 2018
@MorrisJobke
MorrisJobke deleted the backport/12411-12413/unique-constraint-fix branch November 13, 2018 14:04
@MorrisJobkeMorrisJobke mentioned this pull request Nov 22, 2018
@kesselbkesselb mentioned this pull request Nov 23, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@ChristophWurst@kesselb