caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cluster: add sender flags in cluster bus messages header.

Browse Source 
Sender flags were not propagated for the sender, but only for nodes in
the gossip section. This is odd and in the next commits we'll need to
get updated flags for the sender node, so this commit adds a new field
in the cluster messages header.

The message header is the same size as we reused some free space that
was marked as 'unused' because of alignment concerns.
This commit is contained in:
antirez 2013-03-20 10:32:00 +01:00
parent d15b027d91
commit 026b9483db
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cluster.c
View File

@ -1156,6 +1156,7 @@ void clusterBuildMessageHdr(clusterMsg *hdr, int type) {
REDIS_CLUSTER_NAMELEN); REDIS_CLUSTER_NAMELEN);
} }
hdr->port = htons(server.port); hdr->port = htons(server.port);
hdr->flags = htons(server.cluster->myself->flags);
hdr->state = server.cluster->state; hdr->state = server.cluster->state;
memset(hdr->configdigest,0,32); /* FIXME: set config digest */ memset(hdr->configdigest,0,32); /* FIXME: set config digest */

3
src/redis.h
View File

@ -648,8 +648,9 @@ typedef struct {
char slaveof[REDIS_CLUSTER_NAMELEN]; char slaveof[REDIS_CLUSTER_NAMELEN];
char configdigest[32]; char configdigest[32];
uint16_t port; /* Sender TCP base port */ 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 state; /* Cluster state from the POV of the sender */
unsigned char notused[5]; /* Reserved for future use. For alignment. */ unsigned char notused[3]; /* Reserved for future use. For alignment. */
union clusterMsgData data; union clusterMsgData data;
} clusterMsg; } clusterMsg;