[Pkg-owncloud-commits] [owncloud] 68/107: ttl for memcache locking backends that support it

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5ea5d7fa522324534447ec039b3304fbf10c9d9c
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Dec 9 14:41:15 2015 +0100

    ttl for memcache locking backends that support it
---
 lib/private/lock/abstractlockingprovider.php | 2 ++
 lib/private/lock/dblockingprovider.php       | 2 --
 lib/private/lock/memcachelockingprovider.php | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/private/lock/abstractlockingprovider.php b/lib/private/lock/abstractlockingprovider.php
index c7a2938..db5f1c7 100644
--- a/lib/private/lock/abstractlockingprovider.php
+++ b/lib/private/lock/abstractlockingprovider.php
@@ -28,6 +28,8 @@ 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 $acquiredLocks = [
 		'shared' => [],
 		'exclusive' => []
diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index a167687..8eeb34e 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -49,8 +49,6 @@ class DBLockingProvider extends AbstractLockingProvider {
 
 	private $sharedLocks = [];
 
-	const TTL = 3600; // how long until we clear stray locks in seconds
-
 	/**
 	 * Check if we have an open shared lock for a path
 	 *
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index e4158dc..af95200 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -21,6 +21,7 @@
 
 namespace OC\Lock;
 
+use OCP\IMemcacheTTL;
 use OCP\Lock\LockedException;
 use OCP\IMemcache;
 
@@ -37,6 +38,12 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
 		$this->memcache = $memcache;
 	}
 
+	private function setTTL($path) {
+		if ($this->memcache instanceof IMemcacheTTL) {
+			$this->memcache->setTTL($path, self::TTL);
+		}
+	}
+
 	/**
 	 * @param string $path
 	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
@@ -69,6 +76,7 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
 				throw new LockedException($path);
 			}
 		}
+		$this->setTTL($path);
 		$this->markAcquire($path, $type);
 	}
 
@@ -106,6 +114,7 @@ class MemcacheLockingProvider extends AbstractLockingProvider {
 				throw new LockedException($path);
 			}
 		}
+		$this->setTTL($path);
 		$this->markChange($path, $targetType);
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git