upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 07:08:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #38478 from nextcloud/backport/38440/master

Browse source 
[master] fix: Catch Deadlock properly as execute throws Doctrine exceptions not our wrapped ones
This commit is contained in:
Simon L 2023-06-05 23:22:40 +02:00 committed by GitHub
commit 702196dd86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Files/Cache/Updater.php
View file

@ -27,7 +27,7 @@
*/
namespace OC\Files\Cache;
use OC\DB\Exceptions\DbalException;
use Doctrine\DBAL\Exception\DeadlockException;
use OC\Files\FileInfo;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Cache\IUpdater;
@ -260,7 +260,7 @@ class Updater implements IUpdater {
if ($mtime !== false) {
try {
$this->cache->update($parentId, ['storage_mtime' => $mtime]);
} catch (DbalException $e) {
} catch (DeadlockException $e) {
// ignore the failure.
// with failures concurrent updates, someone else would have already done it.
// in the worst case the `storage_mtime` isn't updated, which should at most only trigger an extra rescan