aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Files/Cache
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-04-13 12:53:40 +0200
committerJulius Härtl <jus@bitgrid.net>2023-05-02 19:42:11 +0200
commit3bdd7701297fa0958dddf11e69668dfafe2fa990 (patch)
tree3d033ce51264a098476658f0ce75640c9c59725c /lib/private/Files/Cache
parentc995428431c5b1a6b593cd960d63a25d027b9039 (diff)
downloadnextcloud-server-3bdd7701297fa0958dddf11e69668dfafe2fa990.tar.gz
nextcloud-server-3bdd7701297fa0958dddf11e69668dfafe2fa990.zip
fix: Check for wrapped retriable exceptions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private/Files/Cache')
-rw-r--r--lib/private/Files/Cache/Propagator.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index 4bf88a60843..70fc238d9be 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -24,7 +24,7 @@
namespace OC\Files\Cache;
-use Doctrine\DBAL\Exception\RetryableException;
+use OC\DB\Exceptions\DbalException;
use OC\Files\Storage\Wrapper\Encryption;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Cache\IPropagator;
@@ -136,7 +136,11 @@ class Propagator implements IPropagator {
try {
$builder->executeStatement();
break;
- } catch (RetryableException $e) {
+ } catch (DbalException $e) {
+ if (!$e->isRetryable()) {
+ throw $e;
+ }
+
/** @var LoggerInterface $loggerInterface */
$loggerInterface = \OCP\Server::get(LoggerInterface::class);
$loggerInterface->warning('Retrying propagation query after retryable exception.', [ 'exception' => $e ]);