mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24350 from owncloud/locking-release-memory 

optimize releaselock for memcache based locking backends
This commit is contained in:
Vincent Petry 2016-04-29 17:00:44 +02:00
parent daf5f793a4 49ad0fcfa9
commit b3a2828c46
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Lock/AbstractLockingProvider.php
View File

@ -116,4 +116,8 @@ abstract class AbstractLockingProvider implements ILockingProvider {
$this->releaseLock($path, self::LOCK_EXCLUSIVE); $this->releaseLock($path, self::LOCK_EXCLUSIVE);
} }
} }
protected function getOwnSharedLockCount($path) {
return isset($this->acquiredLocks['shared'][$path]) ? $this->acquiredLocks['shared'][$path] : 0;
}
} }

9
lib/private/Lock/MemcacheLockingProvider.php
View File

@ -88,9 +88,14 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
*/ */
public function releaseLock($path, $type) { public function releaseLock($path, $type) {
if ($type === self::LOCK_SHARED) { if ($type === self::LOCK_SHARED) {
if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) { if ($this->getOwnSharedLockCount($path) === 1) {
$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
if (!$removed) { //someone else also has a shared lock, decrease only
$this->memcache->dec($path);
}
} else {
// if we own more than one lock ourselves just decrease
$this->memcache->dec($path); $this->memcache->dec($path);
$this->memcache->cad($path, 0);
} }
} else if ($type === self::LOCK_EXCLUSIVE) { } else if ($type === self::LOCK_EXCLUSIVE) {
$this->memcache->cad($path, 'exclusive'); $this->memcache->cad($path, 'exclusive');