From 3da39308cd2e6bbc5ab55f95f5971069c577a91f Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 10 Jun 2024 18:01:39 +0200 Subject: fix(files): Use isRetryable to catch retryable exceptions Signed-off-by: Louis Chemineau --- lib/private/Files/Cache/Cache.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 9822b6874f9..26572af2346 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -40,8 +40,8 @@ namespace OC\Files\Cache; -use Doctrine\DBAL\Exception\RetryableException; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; +use OC\DB\Exceptions\DbalException; use OC\Files\Search\SearchComparison; use OC\Files\Search\SearchQuery; use OC\Files\Storage\Wrapper\Encryption; @@ -738,7 +738,11 @@ class Cache implements ICache { } catch (\OC\DatabaseException $e) { $this->connection->rollBack(); throw $e; - } catch (RetryableException $e) { + } catch (DbalException $e) { + if (!$e->isRetryable()) { + throw $e; + } + // Simply throw if we already retried 4 times. if ($i === $retryLimit) { throw $e; -- cgit v1.2.3