summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2013-04-09 11:07:25 +0200
committerantirez <antirez@gmail.com>2013-04-09 11:07:25 +0200
commitef4f25ff6ec9749549b009b515a272ebd0710707 (patch)
treefcefc5dae8ece47ccdc3b70c25d25bdec13ba47a
parentf09b2508f42fcaa14b0fb36a013747611ee2159d (diff)
downloadredis-ef4f25ff6ec9749549b009b515a272ebd0710707.tar.gz
Cluster: configdigest field no longer used. Removed.
-rw-r--r--src/cluster.c3
-rw-r--r--src/redis.h6
2 files changed, 2 insertions, 7 deletions
diff --git a/src/cluster.c b/src/cluster.c
index aad7adaec..cad91314f 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -350,8 +350,6 @@ clusterNode *createClusterNode(char *nodename, int flags) {
node->slaveof = NULL;
node->ping_sent = node->pong_received = 0;
node->fail_time = 0;
- node->configdigest = NULL;
- node->configdigest_ts = 0;
node->link = NULL;
memset(node->ip,0,sizeof(node->ip));
node->port = 0;
@@ -1171,7 +1169,6 @@ void clusterBuildMessageHdr(clusterMsg *hdr, int type) {
hdr->port = htons(server.port);
hdr->flags = htons(server.cluster->myself->flags);
hdr->state = server.cluster->state;
- memset(hdr->configdigest,0,32); /* FIXME: set config digest */
if (type == CLUSTERMSG_TYPE_FAIL) {
totlen = sizeof(clusterMsg)-sizeof(union clusterMsgData);
diff --git a/src/redis.h b/src/redis.h
index 254ef3712..54286990c 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -572,8 +572,6 @@ struct clusterNode {
time_t ping_sent; /* Unix time we sent latest ping */
time_t pong_received; /* Unix time we received the pong */
time_t fail_time; /* Unix time when FAIL flag was set */
- char *configdigest; /* Configuration digest of this node */
- time_t configdigest_ts; /* Configuration digest timestamp */
char ip[16]; /* Latest known IP address of this node */
int port; /* Latest known port of this node */
clusterLink *link; /* TCP/IP link with this node */
@@ -657,11 +655,11 @@ typedef struct {
char sender[REDIS_CLUSTER_NAMELEN]; /* Name of the sender node */
unsigned char myslots[REDIS_CLUSTER_SLOTS/8];
char slaveof[REDIS_CLUSTER_NAMELEN];
- char configdigest[32];
+ char notused1[32]; /* 32 bytes reserved for future usage. */
uint16_t port; /* Sender TCP base port */
uint16_t flags; /* Sender node flags */
unsigned char state; /* Cluster state from the POV of the sender */
- unsigned char notused[3]; /* Reserved for future use. For alignment. */
+ unsigned char notused2[3]; /* Reserved for future use. For alignment. */
union clusterMsgData data;
} clusterMsg;