bug #39431 [Cache] Make use of read_timeout in \RedisSentinel and \Redis (ferrastas)

nicolas-grekas · nicolas-grekas · commit 7c98ee1597df · 2020-12-10T17:41:45.000+01:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Cache] Make use of `read_timeout` in `\RedisSentinel` and `\Redis` | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39429 | License | MIT This is a bugfix for #39363 a feature introduced in 5.x As described in issue #39429, `\RedisSentinel` accepts an optional read timeout value during construction. `read_timeout` is already part of the connection options, this PR just make use of it. Commits ------- 14e36a2 [Cache] Make use of `read_timeout` in `\RedisSentinel` and `\Redis`
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -184,15 +184,15 @@ public static function createConnection($dsn, array $options = [])
                 $port = $hosts[0]['port'] ?? null;
 
                 if (isset($params['redis_sentinel'])) {
-                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);
+                    $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
 
                     if (![$host, $port] = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                         throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $params['redis_sentinel'], $host, $port));
                     }
                 }
 
                 try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);
+                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();

Original file line number	Diff line number	Diff line change
`@@ -184,15 +184,15 @@ public static function createConnection($dsn, array $options = [])`
`184`	`184`	`$port = $hosts[0]['port'] ?? null;`
`185`	`185`
`186`	`186`	`if (isset($params['redis_sentinel'])) {`
`187`		`- $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);`
	`187`	`+ $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);`
`188`	`188`
`189`	`189`	`if (![$host, $port] = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
`190`	`190`	`throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $params['redis_sentinel'], $host, $port));`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`try {`
`195`		`- @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);`
	`195`	`+ @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);`
`196`	`196`
`197`	`197`	`set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });`
`198`	`198`	`$isConnected = $redis->isConnected();`