minor #32075 [Lock] Fix expired lock not cleaned in ZooKeeper (jderusse)

nicolas-grekas · nicolas-grekas · commit 5af1e9e1a504 · 2019-06-17T21:42:39.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Lock] Fix expired lock not cleaned in ZooKeeper | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | ,p | BC breaks? | no  | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31426 | License | MIT | Doc PR | NA Following #32071 for 4.3 branch context: When a lock is acquired BUT not as fast as expected, a LockExpiredException is thrown. Issue is, that the lock is not removed which avoid other process to acquire that lock. This PR clean state of store when a LockExpiredException is triggered in PDO and ZooKeepeer. Commits ------- 4f808ef Fix Expiring lock in PDO and ZooKeeper
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -25,6 +25,8 @@
  */
 class ZookeeperStore implements StoreInterface
 {
+    use ExpiringStoreTrait;
+
     private $zookeeper;
 
     public function __construct(\Zookeeper $zookeeper)
@@ -45,6 +47,8 @@ public function save(Key $key)
         $token = $this->getUniqueToken($key);
 
         $this->createNewLock($resource, $token);
+
+        $this->checkNotExpired($key);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`*/`
`26`	`26`	`class ZookeeperStore implements StoreInterface`
`27`	`27`	`{`
	`28`	`+ use ExpiringStoreTrait;`
	`29`	`+`
`28`	`30`	`private $zookeeper;`
`29`	`31`
`30`	`32`	`public function __construct(\Zookeeper $zookeeper)`
`@@ -45,6 +47,8 @@ public function save(Key $key)`
`45`	`47`	`$token = $this->getUniqueToken($key);`
`46`	`48`
`47`	`49`	`$this->createNewLock($resource, $token);`
	`50`	`+`
	`51`	`+ $this->checkNotExpired($key);`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`/**`