réplica de
https://github.com/nextcloud/server.git
synced 2024-08-29 17:54:44 +02:00
Remove all locks after ttl from the db
Este commit está contenido en:
padre
5c95939bf3
commit
e191953942
@ -235,10 +235,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]
|
||||
);
|
||||
}
|
||||
@ -262,7 +262,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')) {
|
||||
|
@ -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());
|
||||
}
|
||||
|
Cargando…
Referencia en una nueva incidencia
Block a user