wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23553 from owncloud/lock-ttl-execution-time

Browse source 
Make lock ttl configurable
This commit is contained in:
Thomas Müller 2016-04-08 14:53:26 +02:00
commit 1d3d43b1e9
6 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/config.sample.php
View file

@ -1193,6 +1193,15 @@ $CONFIG = array(
*/
'filelocking.enabled' => true,
/**
* Set the time-to-live for locks in secconds.
*
* Any lock older than this will be automatically cleaned up.
*
* If not set this defaults to either 1 hour or the php max_execution_time, whichever is higher.
*/
'filelocking.ttl' => 3600,
/**
* Memory caching backend for file locking
*

9
lib/private/Server.php
View file

@ -519,14 +519,17 @@ class Server extends ServerContainer implements IServerContainer {
);
});
$this->registerService('LockingProvider', function (Server $c) {
if ($c->getConfig()->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
$ini = $c->getIniWrapper();
$config = $c->getConfig();
$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
/** @var \OC\Memcache\Factory $memcacheFactory */
$memcacheFactory = $c->getMemCacheFactory();
$memcache = $memcacheFactory->createLocking('lock');
if (!($memcache instanceof \OC\Memcache\NullCache)) {
return new MemcacheLockingProvider($memcache);
return new MemcacheLockingProvider($memcache, $ttl);
}
return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory());
return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
}
return new NoopLockingProvider();
});

2
lib/private/lock/abstractlockingprovider.php
View file

@ -28,7 +28,7 @@ use OCP\Lock\ILockingProvider;
* to release any left over locks at the end of the request
*/
abstract class AbstractLockingProvider implements ILockingProvider {
const TTL = 3600; // how long until we clear stray locks in seconds
protected $ttl; // how long until we clear stray locks in seconds
protected $acquiredLocks = [
'shared' => [],

6
lib/private/lock/dblockingprovider.php
View file

@ -93,11 +93,13 @@ class DBLockingProvider extends AbstractLockingProvider {
* @param \OCP\IDBConnection $connection
* @param \OCP\ILogger $logger
* @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
* @param int $ttl
*/
public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory, $ttl = 3600) {
$this->connection = $connection;
$this->logger = $logger;
$this->timeFactory = $timeFactory;
$this->ttl = $ttl;
}
/**
@ -117,7 +119,7 @@ class DBLockingProvider extends AbstractLockingProvider {
* @return int
*/
protected function getExpireTime() {
return $this->timeFactory->getTime() + self::TTL;
return $this->timeFactory->getTime() + $this->ttl;
}
/**

6
lib/private/lock/memcachelockingprovider.php
View file

@ -33,14 +33,16 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
/**
* @param \OCP\IMemcache $memcache
* @param int $ttl
*/
public function __construct(IMemcache $memcache) {
public function __construct(IMemcache $memcache, $ttl = 3600) {
$this->memcache = $memcache;
$this->ttl = $ttl;
}
private function setTTL($path) {
if ($this->memcache instanceof IMemcacheTTL) {
$this->memcache->setTTL($path, self::TTL);
$this->memcache->setTTL($path, $this->ttl);
}
}

4
tests/lib/lock/dblockingprovider.php
View file

@ -64,7 +64,7 @@ class DBLockingProvider extends LockingProvider {
*/
protected function getInstance() {
$this->connection = \OC::$server->getDatabaseConnection();
return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory);
return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory, 3600);
}
public function tearDown() {
@ -81,7 +81,7 @@ class DBLockingProvider extends LockingProvider {
$this->instance->acquireLock('bar', ILockingProvider::LOCK_EXCLUSIVE);
$this->instance->changeLock('asd', ILockingProvider::LOCK_SHARED);
$this->currentTime = 150 + \OC\Lock\DBLockingProvider::TTL;
$this->currentTime = 150 + 3600;
$this->assertEquals(3, $this->getLockEntryCount());