Skip to content

[master] fix: Catch Deadlock properly as execute throws Doctrine exceptions not our wrapped ones #38478

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
merged 1 commit into from
Jun 5, 2023
Merged

[master] fix: Catch Deadlock properly as execute throws Doctrine exceptions not our wrapped ones #38478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/private/Files/Cache/Updater.php
View file
Open in desktop
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