Fix Predis client cluster with pipeline

flolivaud · flolivaud · commit 802f95fce94c · 2017-06-20T17:09:54.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Cache\Traits;
 
 use Predis\Connection\Factory;
+use Predis\Connection\Aggregate\ClusterInterface;
 use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\RedisCluster;
 use Predis\Response\Status;
@@ -284,7 +285,7 @@ private function pipeline(\Closure $generator)
     {
         $ids = array();
 
-        if ($this->redis instanceof \Predis\Client) {
+        if ($this->redis instanceof \Predis\Client && !($this->redis->getConnection() instanceof ClusterInterface)) {
             $results = $this->redis->pipeline(function ($redis) use ($generator, &$ids) {
                 foreach ($generator() as $command => $args) {
                     call_user_func_array(array($redis, $command), $args);
@@ -308,9 +309,12 @@ private function pipeline(\Closure $generator)
             foreach ($results as $k => list($h, $c)) {
                 $results[$k] = $connections[$h][$c];
             }
-        } elseif ($this->redis instanceof \RedisCluster) {
-            // phpredis doesn't support pipelining with RedisCluster
+        } elseif ($this->redis instanceof \RedisCluster || (
+                $this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface
+            )) {
+            // phpredis & predis doesn't support pipelining with RedisCluster
             // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
+            // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
             $results = array();
             foreach ($generator() as $command => $args) {
                 $results[] = call_user_func_array(array($this->redis, $command), $args);
