Skip to content

Commit

Permalink
feat(files)): Add retry logic to cover deadlock situations when movin…
Browse files Browse the repository at this point in the history
…g many files

Signed-off-by: Louis Chemineau <louis@chmn.me>
  • Loading branch information
artonge authored and backportbot[bot] committed Mar 28, 2024
1 parent 7442a88 commit 49fe3a2
Showing 1 changed file with 25 additions and 6 deletions.
31 changes: 25 additions & 6 deletions lib/private/Files/Cache/Cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

namespace OC\Files\Cache;

use Doctrine\DBAL\Exception\RetryableException;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OC\Files\Search\SearchComparison;
use OC\Files\Search\SearchQuery;
Expand Down Expand Up @@ -701,7 +702,6 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
throw new \Exception('Invalid target storage id: ' . $targetStorageId);
}

$this->connection->beginTransaction();
if ($sourceData['mimetype'] === 'httpd/unix-directory') {
//update all child entries
$sourceLength = mb_strlen($sourcePath);
Expand All @@ -724,12 +724,31 @@ public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
$query->set('encrypted', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT));
}

try {
$query->execute();
} catch (\OC\DatabaseException $e) {
$this->connection->rollBack();
throw $e;
// Retry transaction in case of RetryableException like deadlocks.
// Retry up to 4 times because we should receive up to 4 concurrent requests from the frontend
$retryLimit = 4;
for ($i = 1; $i <= $retryLimit; $i++) {
try {
$this->connection->beginTransaction();
$query->executeStatement();
break;
} catch (\OC\DatabaseException $e) {
$this->connection->rollBack();
throw $e;
} catch (RetryableException $e) {
// Simply throw if we already retried 4 times.
if ($i === $retryLimit) {
throw $e;
}

$this->connection->rollBack();

// Sleep a bit to give some time to the other transaction to finish.
usleep(100 * 1000 * $i);
}
}
} else {
$this->connection->beginTransaction();
}

$query = $this->getQueryBuilder();
Expand Down

0 comments on commit 49fe3a2

Please sign in to comment.