Merge pull request #37709 from nextcloud/bugfix/deadlock

nextcloud · May 13, 2023 · e18f97f · e18f97f
2 parents 8cab1d7 + 3bdd770
commit e18f97f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php
@@ -37,6 +37,7 @@
 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 @@ public static function wrap(\Doctrine\DBAL\Exception $original, string $message
 		);
 	}
 
+	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
@@ -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 @@ public function propagateChange($internalPath, $time, $sizeDifference = 0) {
 			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 ]);