mirror of
https://github.com/nextcloud/server.git
synced 2024-08-12 14:11:31 +02:00
fix(sharing): Avoid (dead)locking during orphan deletion
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
parent
e072035e86
commit
5c20f5b9a2
@ -1,4 +1,7 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
||||
*
|
||||
@ -24,24 +27,45 @@
|
||||
*/
|
||||
namespace OCA\Files_Sharing;
|
||||
|
||||
use OCP\AppFramework\Db\TTransactional;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
use OCP\BackgroundJob\TimedJob;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\Server;
|
||||
use PDO;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use function array_map;
|
||||
|
||||
/**
|
||||
* Delete all share entries that have no matching entries in the file cache table.
|
||||
*/
|
||||
class DeleteOrphanedSharesJob extends TimedJob {
|
||||
|
||||
use TTransactional;
|
||||
|
||||
private const CHUNK_SIZE = 1000;
|
||||
|
||||
private const INTERVAL = 24 * 60 * 60; // 1 day
|
||||
|
||||
private IDBConnection $db;
|
||||
|
||||
private LoggerInterface $logger;
|
||||
|
||||
/**
|
||||
* sets the correct interval for this timed job
|
||||
*/
|
||||
public function __construct(ITimeFactory $time) {
|
||||
public function __construct(
|
||||
ITimeFactory $time,
|
||||
IDBConnection $db,
|
||||
LoggerInterface $logger
|
||||
) {
|
||||
parent::__construct($time);
|
||||
|
||||
$this->setInterval(24 * 60 * 60); // 1 day
|
||||
$this->db = $db;
|
||||
|
||||
$this->setInterval(self::INTERVAL); // 1 day
|
||||
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
|
||||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -50,15 +74,45 @@ class DeleteOrphanedSharesJob extends TimedJob {
|
||||
* @param array $argument unused argument
|
||||
*/
|
||||
public function run($argument) {
|
||||
$connection = Server::get(IDBConnection::class);
|
||||
$logger = Server::get(LoggerInterface::class);
|
||||
$qbSelect = $this->db->getQueryBuilder();
|
||||
$qbSelect->select('id')
|
||||
->from('share', 's')
|
||||
->leftJoin('s', 'filecache', 'fc', $qbSelect->expr()->eq('s.file_source', 'fc.fileid'))
|
||||
->where($qbSelect->expr()->isNull('fc.fileid'))
|
||||
->setMaxResults(self::CHUNK_SIZE);
|
||||
$deleteQb = $this->db->getQueryBuilder();
|
||||
$deleteQb->delete('share')
|
||||
->where(
|
||||
$deleteQb->expr()->in('id', $deleteQb->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY)
|
||||
);
|
||||
|
||||
$sql =
|
||||
'DELETE FROM `*PREFIX*share` ' .
|
||||
'WHERE `item_type` in (\'file\', \'folder\') ' .
|
||||
'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)';
|
||||
|
||||
$deletedEntries = $connection->executeStatement($sql);
|
||||
$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']);
|
||||
/**
|
||||
* Read a chunk of orphan rows and delete them. Continue as long as the
|
||||
* chunk is filled and time before the next cron run does not run out.
|
||||
*
|
||||
* Note: With isolation level READ COMMITTED, the database will allow
|
||||
* other transactions to delete rows between our SELECT and DELETE. In
|
||||
* that (unlikely) case, our DELETE will have fewer affected rows than
|
||||
* IDs passed for the WHERE IN. If this happens while processing a full
|
||||
* chunk, the logic below will stop prematurely.
|
||||
* Note: The queries below are optimized for low database locking. They
|
||||
* could be combined into one single DELETE with join or sub query, but
|
||||
* that has shown to (dead)lock often.
|
||||
*/
|
||||
$cutOff = $this->time->getTime() + self::INTERVAL;
|
||||
do {
|
||||
$deleted = $this->atomic(function () use ($qbSelect, $deleteQb) {
|
||||
$result = $qbSelect->executeQuery();
|
||||
$ids = array_map('intval', $result->fetchAll(PDO::FETCH_COLUMN));
|
||||
$result->closeCursor();
|
||||
$deleteQb->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);
|
||||
$deleted = $deleteQb->executeStatement();
|
||||
$this->logger->debug("{deleted} orphaned share(s) deleted", [
|
||||
'app' => 'DeleteOrphanedSharesJob',
|
||||
'deleted' => $deleted,
|
||||
]);
|
||||
return $deleted;
|
||||
}, $this->db);
|
||||
} while ($deleted >= self::CHUNK_SIZE && $this->time->getTime() <= $cutOff);
|
||||
}
|
||||
}
|
||||
|
@ -27,7 +27,6 @@
|
||||
namespace OCA\Files_Sharing\Tests;
|
||||
|
||||
use OCA\Files_Sharing\DeleteOrphanedSharesJob;
|
||||
use OCP\AppFramework\Utility\ITimeFactory;
|
||||
use OCP\Share\IShare;
|
||||
|
||||
/**
|
||||
@ -94,7 +93,7 @@ class DeleteOrphanedSharesJobTest extends \Test\TestCase {
|
||||
|
||||
\OC::registerShareHooks(\OC::$server->getSystemConfig());
|
||||
|
||||
$this->job = new DeleteOrphanedSharesJob(\OCP\Server::get(ITimeFactory::class));
|
||||
$this->job = \OCP\Server::get(DeleteOrphanedSharesJob::class);
|
||||
}
|
||||
|
||||
protected function tearDown(): void {
|
||||
|
Loading…
Reference in New Issue
Block a user