Fixing redis cachekey

This commit is contained in:
Philipp Holzer 2019-03-04 21:28:36 +01:00
parent d7426e697d
commit 07bd4cec65
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
6 changed files with 55 additions and 16 deletions

View file

@ -23,7 +23,8 @@ abstract class AbstractLockDriver extends BaseObject implements ILockDriver
* @param string key The Name of the lock * @param string key The Name of the lock
* @return bool Returns true if the lock is set * @return bool Returns true if the lock is set
*/ */
protected function hasAcquiredLock($key) { protected function hasAcquiredLock($key)
{
return isset($this->acquireLock[$key]) && $this->acquiredLocks[$key] === true; return isset($this->acquireLock[$key]) && $this->acquiredLocks[$key] === true;
} }
@ -32,7 +33,8 @@ abstract class AbstractLockDriver extends BaseObject implements ILockDriver
* *
* @param string $key The Name of the lock * @param string $key The Name of the lock
*/ */
protected function markAcquire($key) { protected function markAcquire($key)
{
$this->acquiredLocks[$key] = true; $this->acquiredLocks[$key] = true;
} }
@ -41,18 +43,26 @@ abstract class AbstractLockDriver extends BaseObject implements ILockDriver
* *
* @param string $key The Name of the lock * @param string $key The Name of the lock
*/ */
protected function markRelease($key) { protected function markRelease($key)
{
unset($this->acquiredLocks[$key]); unset($this->acquiredLocks[$key]);
} }
/** /**
* Releases all lock that were set by us * Releases all lock that were set by us
* *
* @return void * @return boolean Was the unlock of all locks successful?
*/ */
public function releaseAll() { public function releaseAll()
{
$return = true;
foreach ($this->acquiredLocks as $acquiredLock => $hasLock) { foreach ($this->acquiredLocks as $acquiredLock => $hasLock) {
$this->releaseLock($acquiredLock); if (!$this->releaseLock($acquiredLock)) {
$return = false;
}
} }
return $return;
} }
} }

View file

@ -65,12 +65,16 @@ class CacheLockDriver extends AbstractLockDriver
{ {
$cachekey = self::getLockKey($key); $cachekey = self::getLockKey($key);
$return = false;
if ($override) { if ($override) {
$this->cache->delete($cachekey); $return = $this->cache->delete($cachekey);
} else { } else {
$this->cache->compareDelete($cachekey, getmypid()); $return = $this->cache->compareDelete($cachekey, getmypid());
} }
$this->markRelease($key); $this->markRelease($key);
return $return;
} }
/** /**

View file

@ -76,11 +76,11 @@ class DatabaseLockDriver extends AbstractLockDriver
$where = ['name' => $key, 'pid' => $this->pid]; $where = ['name' => $key, 'pid' => $this->pid];
} }
DBA::delete('locks', $where); $return = DBA::delete('locks', $where);
$this->markRelease($key); $this->markRelease($key);
return; return $return;
} }
/** /**
@ -88,9 +88,11 @@ class DatabaseLockDriver extends AbstractLockDriver
*/ */
public function releaseAll() public function releaseAll()
{ {
DBA::delete('locks', ['pid' => $this->pid]); $return = DBA::delete('locks', ['pid' => $this->pid]);
$this->acquiredLocks = []; $this->acquiredLocks = [];
return $return;
} }
/** /**

View file

@ -36,14 +36,14 @@ interface ILockDriver
* @param string $key The Name of the lock * @param string $key The Name of the lock
* @param bool $override Overrides the lock to get released * @param bool $override Overrides the lock to get released
* *
* @return void * @return boolean Was the unlock successful?
*/ */
public function releaseLock($key, $override = false); public function releaseLock($key, $override = false);
/** /**
* Releases all lock that were set by us * Releases all lock that were set by us
* *
* @return void * @return boolean Was the unlock of all locks successful?
*/ */
public function releaseAll(); public function releaseAll();
} }

View file

@ -104,4 +104,15 @@ class DatabaseLockDriverTest extends LockTest
parent::testReleaseAfterUnlock(); parent::testReleaseAfterUnlock();
} }
public function testReleaseWitTTL()
{
$this->mockIsLocked('test', false, $this->startTime, 1);
$this->mockAcquireLock('test', 10, false, $this->pid, false, $this->startTime, 1);
$this->mockIsLocked('test', true, $this->startTime, 1);
$this->mockReleaseLock('test', $this->pid, 1);
$this->mockIsLocked('test', false, $this->startTime, 1);
parent::testReleaseWitTTL();
}
} }

View file

@ -87,7 +87,7 @@ abstract class LockTest extends MockedTest
$this->assertTrue($this->instance->isLocked('bar')); $this->assertTrue($this->instance->isLocked('bar'));
$this->assertTrue($this->instance->isLocked('nice')); $this->assertTrue($this->instance->isLocked('nice'));
$this->instance->releaseAll(); $this->assertTrue($this->instance->releaseAll());
$this->assertFalse($this->instance->isLocked('foo')); $this->assertFalse($this->instance->isLocked('foo'));
$this->assertFalse($this->instance->isLocked('bar')); $this->assertFalse($this->instance->isLocked('bar'));
@ -105,18 +105,30 @@ abstract class LockTest extends MockedTest
$this->assertTrue($this->instance->acquireLock('bar', 1)); $this->assertTrue($this->instance->acquireLock('bar', 1));
$this->assertTrue($this->instance->acquireLock('nice', 1)); $this->assertTrue($this->instance->acquireLock('nice', 1));
$this->instance->releaseLock('foo'); $this->assertTrue($this->instance->releaseLock('foo'));
$this->assertFalse($this->instance->isLocked('foo')); $this->assertFalse($this->instance->isLocked('foo'));
$this->assertTrue($this->instance->isLocked('bar')); $this->assertTrue($this->instance->isLocked('bar'));
$this->assertTrue($this->instance->isLocked('nice')); $this->assertTrue($this->instance->isLocked('nice'));
$this->instance->releaseAll(); $this->assertTrue($this->instance->releaseAll());
$this->assertFalse($this->instance->isLocked('bar')); $this->assertFalse($this->instance->isLocked('bar'));
$this->assertFalse($this->instance->isLocked('nice')); $this->assertFalse($this->instance->isLocked('nice'));
} }
/**
* @small
*/
public function testReleaseWitTTL()
{
$this->assertFalse($this->instance->isLocked('test'));
$this->assertTrue($this->instance->acquireLock('test', 1, 10));
$this->assertTrue($this->instance->isLocked('test'));
$this->assertTrue($this->instance->releaseLock('test'));
$this->assertFalse($this->instance->isLocked('test'));
}
/** /**
* @medium * @medium
*/ */