diff --git a/src/cluster.c b/src/cluster.c index aad7adaec8e9adb8dfd22e6528b4bc0e075b87ee..cad91314fcd81118e5427a674cd602ecbd1bce59 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 254ef37126f48a6f7eadf4f8678a587545dd0139..54286990cf04d9de9e63ab2168225a726e49b6d0 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;