Browse Source

fix(sharing): Avoid (dead)locking during orphan deletion

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

[skip ci]
pull/44009/head
Christoph Wurst 4 months ago
parent
commit
83fa8b5ddd

+ 24
- 2
apps/files_sharing/lib/DeleteOrphanedSharesJob.php View File

@@ -1,4 +1,7 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
@@ -24,6 +27,7 @@
*/
namespace OCA\Files_Sharing;

use OCP\AppFramework\Db\TTransactional;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\BackgroundJob\TimedJob;

@@ -31,14 +35,32 @@ use OCP\BackgroundJob\TimedJob;
* 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;
}

/**

+ 1
- 2
apps/files_sharing/tests/DeleteOrphanedSharesJobTest.php View File

@@ -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…
Cancel
Save