Skip to content

[stable29] Use isRetryable to catch retryable exceptions #45808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Jun 12, 2024
Merged

[stable29] Use isRetryable to catch retryable exceptions #45808

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(files): Use isRetryable to catch retryable exceptions 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge @backportbot
artonge authored and backportbot[bot] committed Jun 12, 2024
commit b7cd197315281ef2a6aa0ecb35c8ea4f75a830b0
8 changes: 6 additions & 2 deletions lib/private/Files/Cache/Cache.php
View file
Open in desktop
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 @@ -729,7 +729,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