diff options
author | Louis Chemineau <louis@chmn.me> | 2024-06-10 18:01:39 +0200 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-06-12 08:14:11 +0000 |
commit | 536d1cc26acb32d63d6a8986c55812cff3e6c20e (patch) | |
tree | 95296e4118f5bce49e2d9acc5303e723377c1057 | |
parent | 21ef938fbc4725b838144490a68ab34ef022d8bb (diff) | |
download | nextcloud-server-536d1cc26acb32d63d6a8986c55812cff3e6c20e.tar.gz nextcloud-server-536d1cc26acb32d63d6a8986c55812cff3e6c20e.zip |
fix(files): Use isRetryable to catch retryable exceptions
Signed-off-by: Louis Chemineau <louis@chmn.me>
-rw-r--r-- | lib/private/Files/Cache/Cache.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 1b79e5a648e..b148e0f7476 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; @@ -732,7 +732,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; |