bug #32076 [Lock] Fix PDO prune not called (jderusse)

nicolas-grekas · nicolas-grekas · commit c9ab846a1f8b · 2019-06-17T21:40:30.000+02:00
This PR was merged into the 4.2 branch. Discussion ---------- [Lock] Fix PDO prune not called | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | NA | License | MIT | Doc PR | NA Saving a key in the PDO store have 2 paths: - the key is didn't exists in the store, the process exit as soon as the key has been savec - the key already exists in the store, the process put off the expiration then run GC to prunbe old keys Calling GC only in the 2nd path was a mistake, if the component is well used, the second could never be used. This PR call the GC in the first path too. Commits ------- fc2dc14 Fix PDO prune not called
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -124,9 +124,6 @@ public function save(Key $key)
 
         try {
             $stmt->execute();
-            $this->checkNotExpired($key);
-
-            return;
         } catch (DBALException $e) {
             // the lock is already acquired. It could be us. Let's try to put off.
             $this->putOffExpiration($key, $this->initialTtl);
@@ -135,11 +132,11 @@ public function save(Key $key)
             $this->putOffExpiration($key, $this->initialTtl);
         }
 
-        $this->checkNotExpired($key);
-
         if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) {
             $this->prune();
         }
+
+        $this->checkNotExpired($key);
     }
 
     /**
@@ -289,7 +286,7 @@ public function createTable(): void
     }
 
     /**
-     * Cleanups the table by removing all expired locks.
+     * Cleans up the table by removing all expired locks.
      */
     private function prune(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -124,9 +124,6 @@ public function save(Key $key)`
`124`	`124`
`125`	`125`	`try {`
`126`	`126`	`$stmt->execute();`
`127`		`- $this->checkNotExpired($key);`
`128`		`-`
`129`		`- return;`
`130`	`127`	`} catch (DBALException $e) {`
`131`	`128`	`// the lock is already acquired. It could be us. Let's try to put off.`
`132`	`129`	`$this->putOffExpiration($key, $this->initialTtl);`
`@@ -135,11 +132,11 @@ public function save(Key $key)`
`135`	`132`	`$this->putOffExpiration($key, $this->initialTtl);`
`136`	`133`	`}`
`137`	`134`
`138`		`- $this->checkNotExpired($key);`
`139`		`-`
`140`	`135`	`if ($this->gcProbability > 0 && (1.0 === $this->gcProbability \|\| (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) {`
`141`	`136`	`$this->prune();`
`142`	`137`	`}`
	`138`	`+`
	`139`	`+ $this->checkNotExpired($key);`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`/**`
`@@ -289,7 +286,7 @@ public function createTable(): void`
`289`	`286`	`}`
`290`	`287`
`291`	`288`	`/**`
`292`		`- * Cleanups the table by removing all expired locks.`
	`289`	`+ * Cleans up the table by removing all expired locks.`
`293`	`290`	`*/`
`294`	`291`	`private function prune(): void`
`295`	`292`	`{`