From c2d0737e9878b983c84bc75ba1a0adacd011cc4c Mon Sep 17 00:00:00 2001
From: Daniele Alessandri <suppakilla@gmail.com>
Date: Mon, 21 Jul 2014 14:14:14 +0200
Subject: [PATCH] Fetch cluster slots from node upon first -MOVED response.

This is a more sane default as it allows users to indicate only a few
servers of the whole cluster composition, while it previously required
a more complex configuration of the client using client options.

This feature can be disabled using the "enableClusterNodes()" method.
---
 lib/Predis/Connection/RedisCluster.php       | 2 +-
 tests/Predis/Connection/RedisClusterTest.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Predis/Connection/RedisCluster.php b/lib/Predis/Connection/RedisCluster.php
index aee5de9a..bc09a887 100644
--- a/lib/Predis/Connection/RedisCluster.php
+++ b/lib/Predis/Connection/RedisCluster.php
@@ -46,7 +46,7 @@ use Predis\Command\RawCommand;
  */
 class RedisCluster implements ClusterConnectionInterface, IteratorAggregate, Countable
 {
-    private $askClusterNodes = false;
+    private $askClusterNodes = true;
     private $defaultParameters = array();
     private $pool = array();
     private $slots = array();
diff --git a/tests/Predis/Connection/RedisClusterTest.php b/tests/Predis/Connection/RedisClusterTest.php
index fc745883..a2c2c148 100644
--- a/tests/Predis/Connection/RedisClusterTest.php
+++ b/tests/Predis/Connection/RedisClusterTest.php
@@ -398,6 +398,7 @@ class RedisClusterTest extends PredisTestCase
         $connection2->expects($this->never())->method('writeCommand');
 
         $cluster = new RedisCluster();
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);
 
@@ -418,6 +419,7 @@ class RedisClusterTest extends PredisTestCase
         $connection2->expects($this->once())->method('readResponse')->with($command);
 
         $cluster = new RedisCluster();
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);
 
@@ -477,6 +479,7 @@ class RedisClusterTest extends PredisTestCase
         $factory->expects($this->never())->method('create');
 
         $cluster = new RedisCluster($factory);
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);
 
@@ -520,6 +523,7 @@ class RedisClusterTest extends PredisTestCase
                 ->will($this->returnValue($connection3));
 
         $cluster = new RedisCluster($factory);
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);
 
@@ -553,6 +557,7 @@ class RedisClusterTest extends PredisTestCase
         $factory->expects($this->never())->method('create');
 
         $cluster = new RedisCluster($factory);
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);
 
@@ -593,6 +598,7 @@ class RedisClusterTest extends PredisTestCase
                 ->will($this->returnValue($connection3));
 
         $cluster = new RedisCluster($factory);
+        $cluster->enableClusterNodes(false);
         $cluster->add($connection1);
         $cluster->add($connection2);