Merge branch 'master' into 3.0-merge

# Conflicts:
#	.github/workflows/test.yml
#	composer.json
#	phpunit.xml
#	src/config-apollo/src/Client.php
#	src/http-server/src/Request.php
#	src/redis/src/RedisConnection.php
#	src/utils/composer.json

Author: limingxinleo

src/RedisConnection.php

@@ -16,6 +16,7 @@
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Pool\Connection as BaseConnection;
 use Hyperf\Pool\Exception\ConnectionException;
+use Hyperf\Redis\Exception\InvalidRedisConnectionException;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -193,25 +194,37 @@ protected function createRedisSentinel(): \Redis
             $retryInterval = $this->config['retry_interval'] ?? 0;
             $readTimeout = $this->config['sentinel']['read_timeout'] ?? 0;
             $masterName = $this->config['sentinel']['master_name'] ?? '';
+            shuffle($nodes);
 
-            $host = '';
-            $port = 0;
+            $host = null;
+            $port = null;
             foreach ($nodes as $node) {
-                [$sentinelHost, $sentinelPort] = explode(':', $node);
-                $sentinel = new \RedisSentinel(
-                    $sentinelHost,
-                    intval($sentinelPort),
-                    $timeout,
-                    $persistent,
-                    $retryInterval,
-                    $readTimeout
-                );
-                $masterInfo = $sentinel->getMasterAddrByName($masterName);
-                if (is_array($masterInfo) && count($masterInfo) >= 2) {
-                    [$host, $port] = $masterInfo;
-                    break;
+                try {
+                    [$sentinelHost, $sentinelPort] = explode(':', $node);
+                    $sentinel = new \RedisSentinel(
+                        $sentinelHost,
+                        intval($sentinelPort),
+                        $timeout,
+                        $persistent,
+                        $retryInterval,
+                        $readTimeout
+                    );
+                    $masterInfo = $sentinel->getMasterAddrByName($masterName);
+                    if (is_array($masterInfo) && count($masterInfo) >= 2) {
+                        [$host, $port] = $masterInfo;
+                        break;
+                    }
+                } catch (\Throwable $exception) {
+                    $logger = $this->container->get(StdoutLoggerInterface::class);
+                    $logger->warning('Redis sentinel connection failed, caused by ' . $exception->getMessage());
+                    continue;
                 }
             }
+
+            if ($host === null && $port === null) {
+                throw new InvalidRedisConnectionException('Connect sentinel redis server failed.');
+            }
+
             $redis = $this->createRedis($host, $port, $timeout);
         } catch (\Throwable $e) {
             throw new ConnectionException('Connection reconnect failed ' . $e->getMessage());

tests/RedisTest.php

@@ -172,6 +172,16 @@ public function testNewRedisCluster()
         }
     }
 
+    public function testShuffleNodes()
+    {
+        $nodes = ['127.0.0.1:6379', '127.0.0.1:6378', '127.0.0.1:6377'];
+
+        shuffle($nodes);
+
+        $this->assertIsArray($nodes);
+        $this->assertSame(3, count($nodes));
+    }
+
     private function getRedis()
     {
         $container = $this->getContainer();