Skip to content

[stable13] Unique contraint and deadlock fixes for filecache and file_locks #12434

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.

Sign up for GitHub

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

Merged
MorrisJobke merged 2 commits into from
Nov 13, 2018
Merged

[stable13] Unique contraint and deadlock fixes for filecache and file_locks #12434

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0737a6f
Fix UniqueConstraintViolationException while insert into oc_filecache
MorrisJobke Nov 12, 2018
243516d
Fix UniqueConstraintViolationException while insert into oc_file_locks
MorrisJobke Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
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 <[email protected]>
  • Loading branch information
@MorrisJobke
MorrisJobke committed Nov 13, 2018
commit 243516d785a6d1c22600cd4cdd4c5cf9cd21b0d2
13 changes: 12 additions & 1 deletion lib/private/Lock/DBLockingProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

namespace OC\Lock;

use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OC\DB\QueryBuilder\Literal;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IQueryBuilder;
Expand Down Expand Up @@ -116,7 +117,17 @@ public function __construct(IDBConnection $connection, ILogger $logger, ITimeFac

protected function initLockField($path, $lock = 0) {
$expire = $this->getExpireTime();
return $this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire], ['key']);

try {
$builder = $this->connection->getQueryBuilder();
return $builder->insert('file_locks')
->setValue('key', $builder->createNamedParameter($path))
->setValue('lock', $builder->createNamedParameter($lock))
->setValue('ttl', $builder->createNamedParameter($expire))
->execute();
} catch(UniqueConstraintViolationException $e) {
return 0;
}
}

/**
Expand Down