Skip to content

[Lock] Release PostgreSqlStore connection lock on failure #44723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2021
Merged

[Lock] Release PostgreSqlStore connection lock on failure #44723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 40 additions & 20 deletions src/Symfony/Component/Lock/Store/PostgreSqlStore.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,28 @@ public function save(Key $key)
// prevent concurrency within the same connection
$this->getInternalStore()->save($key);

$sql = 'SELECT pg_try_advisory_lock(:key)';
$stmt = $this->getConnection()->prepare($sql);
$stmt->bindValue(':key', $this->getHashedKey($key));
$result = $stmt->execute();
$lockAcquired = false;

// Check if lock is acquired
if (true === $stmt->fetchColumn()) {
$key->markUnserializable();
// release sharedLock in case of promotion
$this->unlockShared($key);
try {
$sql = 'SELECT pg_try_advisory_lock(:key)';
$stmt = $this->getConnection()->prepare($sql);
$stmt->bindValue(':key', $this->getHashedKey($key));
$result = $stmt->execute();

return;
// Check if lock is acquired
if (true === $stmt->fetchColumn()) {
$key->markUnserializable();
// release sharedLock in case of promotion
$this->unlockShared($key);

$lockAcquired = true;

return;
}
} finally {
if (!$lockAcquired) {
$this->getInternalStore()->delete($key);
}
}

throw new LockConflictedException();
Expand All @@ -122,19 +132,29 @@ public function saveRead(Key $key)
// prevent concurrency within the same connection
$this->getInternalStore()->saveRead($key);

$sql = 'SELECT pg_try_advisory_lock_shared(:key)';
$stmt = $this->getConnection()->prepare($sql);
$lockAcquired = false;

$stmt->bindValue(':key', $this->getHashedKey($key));
$result = $stmt->execute();
try {
$sql = 'SELECT pg_try_advisory_lock_shared(:key)';
$stmt = $this->getConnection()->prepare($sql);

$stmt->bindValue(':key', $this->getHashedKey($key));
$result = $stmt->execute();

// Check if lock is acquired
if (true === $stmt->fetchColumn()) {
$key->markUnserializable();
// release lock in case of demotion
$this->unlock($key);
// Check if lock is acquired
if (true === $stmt->fetchColumn()) {
$key->markUnserializable();
// release lock in case of demotion
$this->unlock($key);

return;
$lockAcquired = true;

return;
}
} finally {
if (!$lockAcquired) {
$this->getInternalStore()->delete($key);
}
}

throw new LockConflictedException();
Expand Down
28 changes: 28 additions & 0 deletions src/Symfony/Component/Lock/Tests/Store/PostgreSqlStoreTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Symfony\Component\Lock\Tests\Store;

use Symfony\Component\Lock\Exception\InvalidArgumentException;
use Symfony\Component\Lock\Exception\LockConflictedException;
use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\PersistingStoreInterface;
use Symfony\Component\Lock\Store\PostgreSqlStore;
Expand Down Expand Up @@ -50,4 +51,31 @@ public function testInvalidDriver()
$this->expectExceptionMessage('The adapter "Symfony\Component\Lock\Store\PostgreSqlStore" does not support');
$store->exists(new Key('foo'));
}

public function testSaveAfterConflict()
{
$store1 = $this->getStore();
$store2 = $this->getStore();

$key = new Key(uniqid(__METHOD__, true));

$store1->save($key);
$this->assertTrue($store1->exists($key));

$lockConflicted = false;

try {
$store2->save($key);
} catch (LockConflictedException $lockConflictedException) {
$lockConflicted = true;
}

$this->assertTrue($lockConflicted);
$this->assertFalse($store2->exists($key));

$store1->delete($key);

$store2->save($key);
$this->assertTrue($store2->exists($key));
}
}