diff options
| author | Simon L <szaimen@e.mail.de> | 2023-06-05 23:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 23:22:40 +0200 |
| commit | 702196dd8602eb5dab0824104d606ca8f05d95ff (patch) | |
| tree | 2c51c75c999708b6a11130d02cf86d00feff1625 /lib/private | |
| parent | a6a40f823c4185eaf40db60d1844d64ae11fb7f6 (diff) | |
| parent | 9453c2d40d292286e6740c1f1bc83862caefcc87 (diff) | |
| download | nextcloud-server-702196dd8602eb5dab0824104d606ca8f05d95ff.tar.gz nextcloud-server-702196dd8602eb5dab0824104d606ca8f05d95ff.zip | |
Merge pull request #38478 from nextcloud/backport/38440/master
[master] fix: Catch Deadlock properly as execute throws Doctrine exceptions not our wrapped ones
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Cache/Updater.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php index d94cff0685d..457dd207e9d 100644 --- a/lib/private/Files/Cache/Updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -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 |