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

Log more info about locking conflicts for memcache locking backends 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2018-05-04 13:30:18 +02:00
parent 642ebea490
commit a070c1177a
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,12 +71,12 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
public function acquireLock($path, $type) {
if ($type === self::LOCK_SHARED) {
if (!$this->memcache->inc($path)) {
throw new LockedException($path);
throw new LockedException($path, null, $this->getExistingLockForException($path));
}
} else {
$this->memcache->add($path, 0);
if (!$this->memcache->cas($path, 0, 'exclusive')) {
throw new LockedException($path);
throw new LockedException($path, null, $this->getExistingLockForException($path));
}
}
$this->setTTL($path);
@ -114,15 +114,26 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
public function changeLock($path, $targetType) {
if ($targetType === self::LOCK_SHARED) {
if (!$this->memcache->cas($path, 'exclusive', 1)) {
throw new LockedException($path);
throw new LockedException($path, null, $this->getExistingLockForException($path));
}
} else if ($targetType === self::LOCK_EXCLUSIVE) {
// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
if (!$this->memcache->cas($path, 1, 'exclusive')) {
throw new LockedException($path);
throw new LockedException($path, null, $this->getExistingLockForException($path));
}
}
$this->setTTL($path);
$this->markChange($path, $targetType);
}
private function getExistingLockForException($path) {
$existing = $this->memcache->get($path);
if (!$existing) {
return 'none';
} else if ($existing === 'exclusive') {
return $existing;
} else {
return $existing . ' shared locks';
}
}
}

10
lib/public/Lock/LockedException.php
View File

@ -45,11 +45,15 @@ class LockedException extends \Exception {
*
* @param string $path locked path
* @param \Exception|null $previous previous exception for cascading
*
* @param string $existingLock since 13.0.3
* @since 8.1.0
*/
public function __construct($path, \Exception $previous = null) {
parent::__construct('"' . $path . '" is locked', 0, $previous);
public function __construct($path, \Exception $previous = null, $existingLock = null) {
$message = '"' . $path . '" is locked';
if ($existingLock) {
$message .= ', existing lock on file: ' . $existingLock;
}
parent::__construct($message, 0, $previous);
$this->path = $path;
}