bug #61161 [Lock] Fallback to eval when LOAD fails due to missing script (santysisi)

nicolas-grekas · nicolas-grekas · commit 3540952d326d · 2025-07-21T10:49:28.000+02:00
This PR was merged into the 7.2 branch. Discussion ---------- [Lock] Fallback to `eval` when `LOAD` fails due to missing script | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #59795 | License | MIT * First attempts to execute the script using `evalSha`. * If the script is missing (NOSCRIPT), tries to load it using script `LOAD`. * If script `LOAD` is not supported, falls back to `eval`. Commits ------- 420d996 [Lock] Fallback to `eval` when `LOAD` fails due to missing script
diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php
@@ -294,7 +294,13 @@ private function evaluate(string $script, string $resource, array $args): mixed
             }
         }
 
-        $this->handlePredisError(fn () => $this->redis->script('LOAD', $script));
+        if ($this->redis->getConnection() instanceof \Predis\Connection\Cluster\ClusterInterface) {
+            foreach ($this->redis as $connection) {
+                $this->handlePredisError(fn () => $connection->script('LOAD', $script));
+            }
+        } else {
+            $this->handlePredisError(fn () => $this->redis->script('LOAD', $script));
+        }
 
         return $this->handlePredisError(fn () => $this->redis->evalSha($scriptSha, 1, $resource, ...$args));
     }

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,13 @@ private function evaluate(string $script, string $resource, array $args): mixed`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
`297`		`- $this->handlePredisError(fn () => $this->redis->script('LOAD', $script));`
	`297`	`+ if ($this->redis->getConnection() instanceof \Predis\Connection\Cluster\ClusterInterface) {`
	`298`	`+ foreach ($this->redis as $connection) {`
	`299`	`+ $this->handlePredisError(fn () => $connection->script('LOAD', $script));`
	`300`	`+ }`
	`301`	`+ } else {`
	`302`	`+ $this->handlePredisError(fn () => $this->redis->script('LOAD', $script));`
	`303`	`+ }`
`298`	`304`
`299`	`305`	`return $this->handlePredisError(fn () => $this->redis->evalSha($scriptSha, 1, $resource, ...$args));`
`300`	`306`	`}`