From 3dad8196b7325105b7edbfe9dd09bcd7ab60de8b Mon Sep 17 00:00:00 2001 From: antirez Date: Wed, 6 Mar 2013 18:24:43 +0100 Subject: [PATCH] Cluster: clusterUpdateState() function simplified. Also the NEEDHELP Cluster state was removed as it will no longer be used by Redis Cluster. --- src/cluster.c | 18 +++++------------- src/redis.h | 1 - 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index be89db32b..27c1f55a4 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -1450,30 +1450,22 @@ int clusterDelSlot(int slot) { * Cluster state evaluation function * -------------------------------------------------------------------------- */ void clusterUpdateState(void) { - int ok = 1; int j; + /* Start assuming the state is OK. We'll turn it into FAIL if there + * are the right conditions. */ + server.cluster->state = REDIS_CLUSTER_OK; + /* Check if all the slots are covered. */ for (j = 0; j < REDIS_CLUSTER_SLOTS; j++) { if (server.cluster->slots[j] == NULL || server.cluster->slots[j]->flags & (REDIS_NODE_FAIL)) { - ok = 0; + server.cluster->state = REDIS_CLUSTER_FAIL; break; } } - /* Update cluster->state accordingly. */ - if (ok) { - if (server.cluster->state == REDIS_CLUSTER_NEEDHELP) { - server.cluster->state = REDIS_CLUSTER_NEEDHELP; - } else { - server.cluster->state = REDIS_CLUSTER_OK; - } - } else { - server.cluster->state = REDIS_CLUSTER_FAIL; - } - /* Compute the cluster size, that is the number of master nodes * serving at least a single slot. */ { diff --git a/src/redis.h b/src/redis.h index 276f07ead..27f8743da 100644 --- a/src/redis.h +++ b/src/redis.h @@ -518,7 +518,6 @@ typedef struct redisOpArray { #define REDIS_CLUSTER_SLOTS 16384 #define REDIS_CLUSTER_OK 0 /* Everything looks ok */ #define REDIS_CLUSTER_FAIL 1 /* The cluster can't work */ -#define REDIS_CLUSTER_NEEDHELP 2 /* The cluster works, but needs some help */ #define REDIS_CLUSTER_NAMELEN 40 /* sha1 hex length */ #define REDIS_CLUSTER_PORT_INCR 10000 /* Cluster port = baseport + PORT_INCR */