Merge pull request #65 from tioncico/master

修复redis 集群一个节点同时存在多个槽位时无法识别的bug
easy-swoole · Dec 24, 2020 · 6737732 · 6737732
2 parents aff6e52 + 48f6ed5
commit 6737732
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/phpunit.php b/phpunit.php
@@ -7,11 +7,6 @@
 
 defined("REDIS_CLUSTER_SERVER_LIST") ?: define('REDIS_CLUSTER_SERVER_LIST',
     [
-        ['127.0.0.1', 6380],
-        ['127.0.0.1', 6381],
-        ['127.0.0.1', 6382],
-        ['127.0.0.1', 6383],
-        ['127.0.0.1', 6384],
-        ['127.0.0.1', 6385],
+        ['127.0.0.1', 9001],
     ]);
 defined("REDIS_CLUSTER_AUTH") ?: define('REDIS_CLUSTER_AUTH', '');
diff --git a/src/CommandHandel/ClusterCommand/ClusterNodes.php b/src/CommandHandel/ClusterCommand/ClusterNodes.php
@@ -35,10 +35,21 @@ public function handelRecv(Response $recv)
                 'port'      => $port,
                 'flags'     => $data[2],
                 'connected' => $data[7],
-                'slot'      => isset($data[8]) ? explode('-', $data[8]) : [],
+                'slotList'  => $this->getSlotList($data),
             ];
             $nodeList[$node['name']] = $node;
         }
         return $nodeList;
     }
+
+    protected function getSlotList($data)
+    {
+        $slotList = [];
+        //获取8后面的数据
+        $slotOriginalData = array_slice($data, 8);
+        foreach ($slotOriginalData as $slotString) {
+            $slotList[] = explode('-', $slotString);
+        }
+        return $slotList;
+    }
 }
diff --git a/src/RedisCluster.php b/src/RedisCluster.php
@@ -285,16 +285,17 @@ public function getMoveNodeId(Response $response)
     public function getSlotNodeId($slotId)
     {
         foreach ($this->nodeList as $key => $node) {
-            if (empty($node['slot'])) {
+            if (empty($node['slotList'])) {
                 continue;
             }
 
             if (strpos($node['flags'], 'master') === false) {
                 continue;
             }
-
-            if ($node['slot'][0] <= $slotId && $node['slot'][1] >= $slotId) {
-                return $key;
+            foreach ($node['slotList'] as $slot){
+                if ($slot[0] <= $slotId && $slot[1] >= $slotId) {
+                    return $key;
+                }
             }
         }
         return null;

diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -29,7 +29,7 @@ class RedisClusterTest extends TestCase
      */
     protected $redisPHPSerialize;
 
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->redis = new RedisCluster(new RedisClusterConfig(REDIS_CLUSTER_SERVER_LIST, [

diff --git a/tests/UnixSocketRedisTest.php b/tests/UnixSocketRedisTest.php
@@ -22,7 +22,7 @@ class UnixSocketRedisTest extends TestCase
      */
     protected $redis;
 
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->redis = new Redis(new RedisConfig([