Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[Messenger] Support Redis Cluster #40155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2021
Merged

[Messenger] Support Redis Cluster #40155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions 2 src/Symfony/Component/Messenger/Bridge/Redis/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CHANGELOG

* Add `rediss://` DSN scheme support for TLS protocol
* Deprecate TLS option, use `rediss://127.0.0.1` instead of `redis://127.0.0.1?tls=1`
* Add support for `\RedisCluster` instance in `Connection` constructor
* Add support for Redis Cluster in DSN

5.2.0
-----
Expand Down
47 changes: 47 additions & 0 deletions 47 src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ public static function setUpBeforeClass(): void
}
}

private function skipIfRedisClusterUnavailable()
{
try {
new \RedisCluster(null, explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
} catch (\Exception $e) {
self::markTestSkipped($e->getMessage());
}
}

public function testFromInvalidDsn()
{
$this->expectException(\InvalidArgumentException::class);
Expand All @@ -59,6 +68,20 @@ public function testFromDsn()
);
}

public function testFromDsnWithMultipleHosts()
{
$this->skipIfRedisClusterUnavailable();

$hosts = explode(' ', getenv('REDIS_CLUSTER_HOSTS'));

$dsn = array_map(function ($host) {
return 'redis://'.$host;
}, $hosts);
$dsn = implode(',', $dsn);

$this->assertInstanceOf(Connection::class, Connection::fromDsn($dsn));
}

public function testFromDsnOnUnixSocket()
{
$this->assertEquals(
Expand Down Expand Up @@ -160,6 +183,14 @@ public function testDeprecationIfInvalidOptionIsPassedWithDsn()
Connection::fromDsn('redis://localhost/queue?foo=bar');
}

public function testRedisClusterInstanceIsSupported()
{
$this->skipIfRedisClusterUnavailable();

$redis = new \RedisCluster(null, explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
$this->assertInstanceOf(Connection::class, new Connection([], [], [], $redis));
}

public function testKeepGettingPendingMessages()
{
$redis = $this->createMock(\Redis::class);
Expand Down Expand Up @@ -429,4 +460,20 @@ public function testLazy()
$connection->reject($message['id']);
$redis->del('messenger-lazy');
}

public function testLazyCluster()
{
$this->skipIfRedisClusterUnavailable();

$connection = new Connection(
['lazy' => true],
['host' => explode(' ', getenv('REDIS_CLUSTER_HOSTS'))]
);

$connection->add('1', []);
$this->assertNotEmpty($message = $connection->get());
$this->assertSame('1', $message['body']);
$connection->reject($message['id']);
$connection->cleanup();
}
}
117 changes: 83 additions & 34 deletions 117 src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ class Connection
private $deleteAfterReject;
private $couldHavePendingMessages = true;

public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], \Redis $redis = null)
/**
* @param \Redis|\RedisCluster|null $redis
*/
public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], $redis = null)
{
if (version_compare(phpversion('redis'), '4.3.0', '<')) {
throw new LogicException('The redis transport requires php-redis 4.3.0 or higher.');
Expand All @@ -71,29 +74,19 @@ public function __construct(array $configuration, array $connectionCredentials =
$auth = null;
}

$initializer = static function ($redis) use ($host, $port, $auth, $serializer, $dbIndex) {
$redis->connect($host, $port);
$redis->setOption(\Redis::OPT_SERIALIZER, $serializer);

if (null !== $auth && !$redis->auth($auth)) {
throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
}

if ($dbIndex && !$redis->select($dbIndex)) {
throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
}

return true;
};

if (null === $redis) {
$redis = new \Redis();
}

if ($configuration['lazy'] ?? self::DEFAULT_OPTIONS['lazy']) {
$redis = new RedisProxy($redis, $initializer);
$lazy = $configuration['lazy'] ?? self::DEFAULT_OPTIONS['lazy'];
if (\is_array($host) || $redis instanceof \RedisCluster) {
$hosts = \is_string($host) ? [$host.':'.$port] : $host; // Always ensure we have an array
$initializer = static function ($redis) use ($hosts, $auth, $serializer) {
return self::initializeRedisCluster($redis, $hosts, $auth, $serializer);
};
$redis = $lazy ? new RedisClusterProxy($redis, $initializer) : $initializer($redis);
} else {
$initializer($redis);
$redis = $redis ?? new \Redis();
$initializer = static function ($redis) use ($host, $port, $auth, $serializer, $dbIndex) {
return self::initializeRedis($redis, $host, $port, $auth, $serializer, $dbIndex);
};
$redis = $lazy ? new RedisProxy($redis, $initializer) : $initializer($redis);
}

$this->connection = $redis;
Expand All @@ -116,21 +109,57 @@ public function __construct(array $configuration, array $connectionCredentials =
$this->claimInterval = $configuration['claim_interval'] ?? self::DEFAULT_OPTIONS['claim_interval'];
}

public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self
private static function initializeRedis(\Redis $redis, string $host, int $port, ?string $auth, int $serializer, int $dbIndex): \Redis
{
$url = $dsn;
$scheme = 0 === strpos($dsn, 'rediss:') ? 'rediss' : 'redis';
$redis->connect($host, $port);
$redis->setOption(\Redis::OPT_SERIALIZER, $serializer);

if (preg_match('#^'.$scheme.':///([^:@])+$#', $dsn)) {
$url = str_replace($scheme.':', 'file:', $dsn);
if (null !== $auth && !$redis->auth($auth)) {
throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
}

if (false === $parsedUrl = parse_url($url)) {
throw new InvalidArgumentException(sprintf('The given Redis DSN "%s" is invalid.', $dsn));
if ($dbIndex && !$redis->select($dbIndex)) {
throw new InvalidArgumentException('Redis connection failed: '.$redis->getLastError());
}
if (isset($parsedUrl['query'])) {
parse_str($parsedUrl['query'], $dsnOptions);
$redisOptions = array_merge($redisOptions, $dsnOptions);

return $redis;
}

private static function initializeRedisCluster(?\RedisCluster $redis, array $hosts, ?string $auth, int $serializer): \RedisCluster
{
if (null === $redis) {
$redis = new \RedisCluster(null, $hosts, 0.0, 0.0, false, $auth);
}

$redis->setOption(\Redis::OPT_SERIALIZER, $serializer);

return $redis;
}

/**
* @param \Redis|\RedisCluster|null $redis
*/
public static function fromDsn(string $dsn, array $redisOptions = [], $redis = null): self
{
if (false === strpos($dsn, ',')) {
$parsedUrl = self::parseDsn($dsn, $redisOptions);
} else {
$dsns = explode(',', $dsn);
$parsedUrls = array_map(function ($dsn) use (&$redisOptions) {
return self::parseDsn($dsn, $redisOptions);
}, $dsns);

// Merge all the URLs, the last one overrides the previous ones
$parsedUrl = array_merge(...$parsedUrls);

// Regroup all the hosts in an array interpretable by RedisCluster
$parsedUrl['host'] = array_map(function ($parsedUrl, $dsn) {
if (!isset($parsedUrl['host'])) {
throw new InvalidArgumentException(sprintf('Missing host in DSN part "%s", it must be defined when using Redis Cluster.', $dsn));
}

return $parsedUrl['host'].':'.($parsedUrl['port'] ?? 6379);
nesk marked this conversation as resolved.
Show resolved Hide resolved
}, $parsedUrls, $dsns);
}

self::validateOptions($redisOptions);
Expand Down Expand Up @@ -165,7 +194,7 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
unset($redisOptions['dbindex']);
}

$tls = 'rediss' === $scheme;
$tls = 'rediss' === $parsedUrl['scheme'];
if (\array_key_exists('tls', $redisOptions)) {
trigger_deprecation('symfony/redis-messenger', '5.3', 'Providing "tls" parameter is deprecated, use "rediss://" DSN scheme instead');
$tls = filter_var($redisOptions['tls'], \FILTER_VALIDATE_BOOLEAN);
Expand Down Expand Up @@ -223,6 +252,26 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
return new self($configuration, $connectionCredentials, $redisOptions, $redis);
}

private static function parseDsn(string $dsn, array &$redisOptions): array
{
$url = $dsn;
$scheme = 0 === strpos($dsn, 'rediss:') ? 'rediss' : 'redis';

if (preg_match('#^'.$scheme.':///([^:@])+$#', $dsn)) {
$url = str_replace($scheme.':', 'file:', $dsn);
}

if (false === $parsedUrl = parse_url($url)) {
throw new InvalidArgumentException(sprintf('The given Redis DSN "%s" is invalid.', $dsn));
}
if (isset($parsedUrl['query'])) {
parse_str($parsedUrl['query'], $dsnOptions);
$redisOptions = array_merge($redisOptions, $dsnOptions);
}

return $parsedUrl;
}

private static function validateOptions(array $options): void
{
$availableOptions = array_keys(self::DEFAULT_OPTIONS);
Expand Down
42 changes: 42 additions & 0 deletions 42 src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisClusterProxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Messenger\Bridge\Redis\Transport;

/**
* Allow to delay connection to Redis Cluster.
*
* @author Johann Pardanaud <johann@pardanaud.com>
*
* @internal
*/
class RedisClusterProxy
{
private $redis;
private $initializer;
private $ready = false;

public function __construct(?\RedisCluster $redis, \Closure $initializer)
{
$this->redis = $redis;
$this->initializer = $initializer;
}

public function __call(string $method, array $args)
{
if (!$this->ready) {
$this->redis = $this->initializer->__invoke($this->redis);
$this->ready = true;
}

return $this->redis->{$method}(...$args);
}
}
5 changes: 4 additions & 1 deletion 5 src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisProxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ public function __construct(\Redis $redis, \Closure $initializer)

public function __call(string $method, array $args)
{
$this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);
if (!$this->ready) {
$this->redis = $this->initializer->__invoke($this->redis);
$this->ready = true;
}
Comment on lines +36 to +39
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Im missing something, but can you tell me why this was changed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's because the signature of the initializer has changed (this is fine because this is internal)


return $this->redis->{$method}(...$args);
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.