Merge pull request #9389 from nextcloud/log-lock-state-on-conflict-13

[13] Log lock state on conflict

lib/private/Files/Storage/Common.php

@@ -772,9 +772,7 @@ abstract class Common implements Storage, ILockingStorage {
 		try {
 			$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
 		} catch (LockedException $e) {
-			if ($logger) {
+			\OC::$server->getLogger()->logException($e);
-				$logger->logException($e);
-			}
 			throw $e;
 		}
 	}

lib/private/Lock/MemcacheLockingProvider.php

@@ -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';
+		}
+	}
 }

lib/public/Lock/LockedException.php

@@ -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) {
+	public function __construct($path, \Exception $previous = null, $existingLock = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
+		$message = '"' . $path . '" is locked';
+		if ($existingLock) {
+			$message .= ', existing lock on file: ' . $existingLock;
+		}
+		parent::__construct($message, 0, $previous);
 		$this->path = $path;
 	}