From: antirez <antirez@gmail.com>
Date: Tue, 12 Apr 2011 13:36:10 +0000 (+0200)
Subject: Merge branch 'unstable' of github.com:antirez/redis into unstable
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/d415f9ff41ed5b87de9baa7a9521431ed7d78d3c?ds=sidebyside;hp=-c

Merge branch 'unstable' of github.com:antirez/redis into unstable
---

d415f9ff41ed5b87de9baa7a9521431ed7d78d3c
diff --combined src/cluster.c
index 70c34aab,0a580fa7..4e3cf746
--- a/src/cluster.c
+++ b/src/cluster.c
@@@ -943,7 -943,6 +943,7 @@@ void clusterCron(void) 
                  node->flags &= ~REDIS_NODE_PFAIL;
              } else if (node->flags & REDIS_NODE_FAIL && !node->numslaves) {
                  node->flags &= ~REDIS_NODE_FAIL;
 +                clusterUpdateState();
              }
          } else {
              /* Timeout reached. Set the noad se possibly failing if it is
@@@ -1193,11 -1192,13 +1193,13 @@@ void clusterCommand(redisClient *c) 
              "cluster_slots_ok:%d\r\n"
              "cluster_slots_pfail:%d\r\n"
              "cluster_slots_fail:%d\r\n"
+             "cluster_known_nodes:%lu\r\n"
              , statestr[server.cluster.state],
              slots_assigned,
              slots_ok,
              slots_pfail,
-             slots_fail
+             slots_fail,
+             dictSize(server.cluster.nodes)
          );
          addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
              (unsigned long)sdslen(info)));