redis-trib can now assign hash slots to initialize a cluster. Next step is to join...

[redis.git] / src / cluster.c

diff --git a/src/cluster.c b/src/cluster.c
index e2b8204461d7a95cda0f0e4f6f1217c718ad275a..4e3cf74658141494810abe69a4e5997561fd1a4d 100644 (file)
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -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;
                 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
             }
         } else {
             /* Timeout reached. Set the noad se possibly failing if it is


@@ -1192,11 +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_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,
             , 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)));
         );
         addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
             (unsigned long)sdslen(info)));