Skip to content

[stable31] Fix/lock deletion #900

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
merged 2 commits into from
Nov 12, 2025
+36 −8
Merged

[stable31] Fix/lock deletion #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a90b8b5
test: add test that checks for locks deletion
salmart-dev Nov 11, 2025
a183d75
fix: issue in query which leads to no locks removed
salmart-dev Nov 11, 2025
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
6 changes: 3 additions & 3 deletions lib/Cron/Unlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ public function __construct(ITimeFactory $timeFactory, LockService $lockService)
}

protected function run($argument): void {
$this->manageTimeoutLock();
$this->deleteExpiredLocks();
}

private function manageTimeoutLock(): void {
$this->lockService->removeLocks($this->lockService->getDeprecatedLocks());
private function deleteExpiredLocks(): void {
$this->lockService->removeLocks($this->lockService->getDeprecatedLocks(1000));
}
}
2 changes: 1 addition & 1 deletion lib/Db/CoreQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function limitToFileId(int $fileId): void {
* @param array $ids
*/
public function limitToIds(array $ids): void {
$this->limitArray('id', $ids);
$this->limitInArray('id', $ids);
}

public function limitToFileIds(array $ids): void {
Expand Down
7 changes: 6 additions & 1 deletion lib/Db/LocksRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,21 @@ public function getAll(): array {

/**
* @param int $timeout in minutes
* @param int $limit how many locks to retrieve (0 for all, default)
*
* @return FileLock[]
* @throws Exception
*/
public function getLocksOlderThan(int $timeout): array {
public function getLocksOlderThan(int $timeout, int $limit = 0): array {
$now = \OC::$server->get(ITimeFactory::class)->getTime();
$oldCreationTime = $now - $timeout * 60;
$qb = $this->getLocksSelectSql();
$qb->andWhere($qb->expr()->lt('l.creation', $qb->createNamedParameter($oldCreationTime, IQueryBuilder::PARAM_INT)));

if ($limit !== 0) {
$qb->setMaxResults($limit);
}

return $this->getLocksFromRequest($qb);
}
}
6 changes: 4 additions & 2 deletions lib/Service/LockService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,11 @@ public function unlockFile(int $fileId, string $userId, bool $force = false, int


/**
* @param int $limit how many locks to retrieve (0 for all, default)
*
* @return FileLock[]
*/
public function getDeprecatedLocks(): array {
public function getDeprecatedLocks(int $limit = 0): array {
$timeout = (int)$this->configService->getAppValue(ConfigService::LOCK_TIMEOUT);
if ($timeout === 0) {
$this->logger->notice(
Expand All @@ -286,7 +288,7 @@ public function getDeprecatedLocks(): array {
}

try {
$locks = $this->locksRequest->getLocksOlderThan($timeout);
$locks = $this->locksRequest->getLocksOlderThan($timeout, $limit);
} catch (Exception $e) {
$this->logger->warning('Failed to get locks older then timeout', ['exception' => $e]);
return [];
Expand Down
2 changes: 1 addition & 1 deletion lib/Tools/Db/ExtendedQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function limitToId(int $id): void {
* @param array $ids
*/
public function limitToIds(array $ids): void {
$this->limitArray('id', $ids);
$this->limitInArray('id', $ids);
}

/**
Expand Down
21 changes: 21 additions & 0 deletions tests/Feature/LockFeatureTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,27 @@ public function testExpiredLocksAreDeprecated() {
self::assertNotEmpty($deprecated);
}

public function testRemoveLocks(): void {
$service = \OCP\Server::get(LockService::class);
\OCP\Server::get(IConfig::class)->setAppValue(Application::APP_ID, ConfigService::LOCK_TIMEOUT, 30);
$file = $this->loginAndGetUserFolder(self::TEST_USER1)->newFile('test-expired-lock-is-deprecated', 'AAA');
$lock1 = $this->lockManager->lock(new LockContext($file, ILock::TYPE_USER, self::TEST_USER1));
$file2 = $this->loginAndGetUserFolder(self::TEST_USER1)->newFile('test-expired-lock-is-deprecated-2', 'AAA');
$lock2 = $this->lockManager->lock(new LockContext($file2, ILock::TYPE_USER, self::TEST_USER1));
$this->toTheFuture(3600);
$mapToTokens = fn (ILock $lock) => $lock->getToken();
$deprecated = array_map($mapToTokens, $service->getDeprecatedLocks());

self::assertContains($lock1->getToken(), $deprecated);
self::assertContains($lock2->getToken(), $deprecated);

$service->removeLocks([$lock1, $lock2]);
$deprecated = array_map($mapToTokens, $service->getDeprecatedLocks());

self::assertNotContains($lock1->getToken(), $deprecated);
self::assertNotContains($lock2->getToken(), $deprecated);
}

public function testLockUserInfinite() {
\OCP\Server::get(IConfig::class)->setAppValue(Application::APP_ID, ConfigService::LOCK_TIMEOUT, 0);
$file = $this->loginAndGetUserFolder(self::TEST_USER1)
Expand Down
Loading