Skip to content

Commit

Permalink
fix(files): Use isRetryable to catch retryable exceptions
Browse files Browse the repository at this point in the history
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
artonge authored and backportbot[bot] committed Jun 12, 2024
1 parent 21ef938 commit 536d1cc
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/private/Files/Cache/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -732,7 +732,11 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
} 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;
Expand Down

0 comments on commit 536d1cc

Please sign in to comment.