fix: Check for wrapped retriable exceptions

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php
index f9610c5bf2597bef32cec2feefe3e1c734f90f61..2b860a50ff36b28266f0740f7ac39f4a5f6b9533 100644 (file)
--- a/lib/private/DB/Exceptions/DbalException.php
+++ b/lib/private/DB/Exceptions/DbalException.php
@@ -37,6 +37,7 @@ use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\DBAL\Exception\InvalidFieldNameException;
 use Doctrine\DBAL\Exception\NonUniqueFieldNameException;
 use Doctrine\DBAL\Exception\NotNullConstraintViolationException;
+use Doctrine\DBAL\Exception\RetryableException;
 use Doctrine\DBAL\Exception\ServerException;
 use Doctrine\DBAL\Exception\SyntaxErrorException;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
@@ -74,6 +75,10 @@ class DbalException extends Exception {
                );
        }
 
+       public function isRetryable(): bool {
+               return $this->original instanceof RetryableException;
+       }
+
        public function getReason(): ?int {
                /**
                 * Constraint errors

diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index 4bf88a60843539179dbed54a970f72d9ecadbc57..70fc238d9bed35ba89b139aa1c441362650450c2 100644 (file)
--- 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 ]);