Skip to content

Commit

Permalink
Merge pull request #38479 from nextcloud/backport/38440/stable26
Browse files Browse the repository at this point in the history
[stable26] fix: Catch Deadlock properly as execute throws Doctrine exceptions not our wrapped ones
  • Loading branch information
szaimen authored Jun 6, 2023
2 parents 67155c6 + 0a75947 commit c77aab6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/private/Files/Cache/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -260,7 +260,7 @@ private function correctParentStorageMtime($internalPath) {
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
Expand Down

0 comments on commit c77aab6

Please sign in to comment.