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 ab101d4366cc4565427fb99f603b66c2845f8f2b..4e3cf74658141494810abe69a4e5997561fd1a4d 100644 (file)
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -134,6 +134,7 @@ int clusterLoadConfig(char *filename) {
     redisAssert(server.cluster.myself != NULL);
     redisLog(REDIS_NOTICE,"Node configuration loaded, I'm %.40s",
         server.cluster.myself->name);
     redisAssert(server.cluster.myself != NULL);
     redisLog(REDIS_NOTICE,"Node configuration loaded, I'm %.40s",
         server.cluster.myself->name);

+    clusterUpdateState();

     return REDIS_OK;
 
 fmterr:
     return REDIS_OK;
 
 fmterr:


@@ -631,7 +632,8 @@ int clusterProcessPacket(clusterLink *link) {
         clusterNode *failing;
 
         failing = clusterLookupNode(hdr->data.fail.about.nodename);
         clusterNode *failing;
 
         failing = clusterLookupNode(hdr->data.fail.about.nodename);

-        if (failing && !(failing->flags & REDIS_NODE_FAIL)) {
+        if (failing && !(failing->flags & (REDIS_NODE_FAIL|REDIS_NODE_MYSELF)))
+        {

             redisLog(REDIS_NOTICE,
                 "FAIL message received from %.40s about %.40s",
                 hdr->sender, hdr->data.fail.about.nodename);
             redisLog(REDIS_NOTICE,
                 "FAIL message received from %.40s about %.40s",
                 hdr->sender, hdr->data.fail.about.nodename);


@@ -919,8 +921,8 @@ void clusterCron(void) {
         int delay;
 
         if (node->flags &
         int delay;
 
         if (node->flags &

-            (REDIS_NODE_MYSELF|REDIS_NODE_NOADDR|REDIS_NODE_HANDSHAKE|
-             REDIS_NODE_FAIL)) continue;
+            (REDIS_NODE_MYSELF|REDIS_NODE_NOADDR|REDIS_NODE_HANDSHAKE))
+                continue;

         /* Check only if we already sent a ping and did not received
          * a reply yet. */
         if (node->ping_sent == 0 ||
         /* Check only if we already sent a ping and did not received
          * a reply yet. */
         if (node->ping_sent == 0 ||


@@ -941,11 +943,12 @@ 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
              * not already in this state. */
             }
         } else {
             /* Timeout reached. Set the noad se possibly failing if it is
              * not already in this state. */

-            if (!(node->flags & REDIS_NODE_PFAIL)) {
+            if (!(node->flags & (REDIS_NODE_PFAIL|REDIS_NODE_FAIL))) {

                 redisLog(REDIS_DEBUG,"*** NODE %.40s possibly failing",
                     node->name);
                 node->flags |= REDIS_NODE_PFAIL;
                 redisLog(REDIS_DEBUG,"*** NODE %.40s possibly failing",
                     node->name);
                 node->flags |= REDIS_NODE_PFAIL;


@@ -990,7 +993,7 @@ int clusterNodeGetSlotBit(clusterNode *n, int slot) {
  * an error and REDIS_ERR is returned. */
 int clusterAddSlot(clusterNode *n, int slot) {
     redisAssert(clusterNodeSetSlotBit(n,slot) == 0);
  * an error and REDIS_ERR is returned. */
 int clusterAddSlot(clusterNode *n, int slot) {
     redisAssert(clusterNodeSetSlotBit(n,slot) == 0);

-    server.cluster.slots[slot] = server.cluster.myself;
+    server.cluster.slots[slot] = n;

     printf("SLOT %d added to %.40s\n", slot, n->name);
     return REDIS_OK;
 }
     printf("SLOT %d added to %.40s\n", slot, n->name);
     return REDIS_OK;
 }


@@ -1190,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)));