[Cache] fix using multiple Redis Sentinel hosts when the first one is not resolvable

digilist · digilist · commit 4ab66afb7ae4 · 2023-09-07T22:45:45.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -217,8 +217,11 @@ public static function createConnection(string $dsn, array $options = [])
                     }
                     $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
 
-                    if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
-                        [$host, $port] = $address;
+                    try {
+                        if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
+                            [$host, $port] = $address;
+                        }
+                    } catch (\RedisException $e) {
                     }
                 } while (++$hostIndex < \count($hosts) && !$address);
 

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,11 @@ public static function createConnection(string $dsn, array $options = [])`
`217`	`217`	`}`
`218`	`218`	`$sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
`219`	`219`
`220`		`- if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
`221`		`- [$host, $port] = $address;`
	`220`	`+ try {`
	`221`	`+ if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
	`222`	`+ [$host, $port] = $address;`
	`223`	`+ }`
	`224`	`+ } catch (\RedisException $e) {`
`222`	`225`	`}`
`223`	`226`	`} while (++$hostIndex < \count($hosts) && !$address);`
`224`	`227`