Merge pull request #21072 from owncloud/db-lock-ttl

Remove all locks after ttl from the db

2 files changed, 4 insertions, 10 deletions

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index b3a12bb9a07..1b5142a90d2 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -233,10 +233,10 @@ class DBLockingProvider extends AbstractLockingProvider {
 	/**
 	 * cleanup empty locks
 	 */
-	public function cleanEmptyLocks() {
+	public function cleanExpiredLocks() {
 		$expire = $this->timeFactory->getTime();
 		$this->connection->executeUpdate(
-			'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0 AND `ttl` < ?',
+			'DELETE FROM `*PREFIX*file_locks` WHERE `ttl` < ?',
 			[$expire]
 		);
 	}
@@ -260,7 +260,7 @@ class DBLockingProvider extends AbstractLockingProvider {
 
 	public function __destruct() {
 		try {
-			$this->cleanEmptyLocks();
+			$this->cleanExpiredLocks();
 		} catch (\Exception $e) {
 			// If the table is missing, the clean up was successful
 			if ($this->connection->tableExists('file_locks')) {
diff --git a/tests/lib/lock/dblockingprovider.php b/tests/lib/lock/dblockingprovider.php
index d679b1ea677..2032110f4f0 100644
--- a/tests/lib/lock/dblockingprovider.php
+++ b/tests/lib/lock/dblockingprovider.php
@@ -85,13 +85,7 @@ class DBLockingProvider extends LockingProvider {
 
 		$this->assertEquals(3, $this->getLockEntryCount());
 
-		$this->instance->cleanEmptyLocks();
-
-		$this->assertEquals(3, $this->getLockEntryCount());
-
-		$this->instance->releaseAll();
-
-		$this->instance->cleanEmptyLocks();
+		$this->instance->cleanExpiredLocks();
 
 		$this->assertEquals(2, $this->getLockEntryCount());
 	}