fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-20 17:40:50 +00:00
Code Issues Projects Releases Wiki Activity

Cluster Manager: fix bus error in clusterManagerGetLinkStatus

Browse Source
This commit is contained in:
artix 2019-01-09 18:49:38 +01:00
parent 121adc604b
commit 6e9864fe0d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/redis-cli.c
View File

@ -1994,6 +1994,15 @@ static dictType clusterManagerDictType = {
dictSdsDestructor /* val destructor */ dictSdsDestructor /* val destructor */
}; };
static dictType clusterManagerLinkDictType = {
dictSdsHash, /* hash function */
NULL, /* key dup */
NULL, /* val dup */
dictSdsKeyCompare, /* key compare */
dictSdsDestructor, /* key destructor */
dictListDestructor /* val destructor */
};
typedef int clusterManagerCommandProc(int argc, char **argv); typedef int clusterManagerCommandProc(int argc, char **argv);
typedef int (*clusterManagerOnReplyError)(redisReply *reply, typedef int (*clusterManagerOnReplyError)(redisReply *reply,
clusterManagerNode *n, int bulk_idx); clusterManagerNode *n, int bulk_idx);
@ -3889,7 +3898,7 @@ static list *clusterManagerGetDisconnectedLinks(clusterManagerNode *node) {
(strstr(link_status, "disconnected"))); (strstr(link_status, "disconnected")));
int handshaking = (strstr(flags, "handshake") != NULL); int handshaking = (strstr(flags, "handshake") != NULL);
if (disconnected || handshaking) { if (disconnected || handshaking) {
clusterManagerLink *link = zmalloc(sizeof(*link)); clusterManagerLink *link = zmalloc(sizeof(*link));
link->node_name = sdsnew(nodename); link->node_name = sdsnew(nodename);
link->node_addr = sdsnew(addr); link->node_addr = sdsnew(addr);
link->connected = 0; link->connected = 0;
@ -3902,15 +3911,12 @@ cleanup:
return links; return links;
} }
/* Check for disconnected cluster links. It returns a dict whose keys /* Check for disconnected cluster links. It returns a dict whose keys
* are the unreachable node addresses and the values are lists of * are the unreachable node addresses and the values are lists of
* node addresses that cannot reach the unreachable node. */ * node addresses that cannot reach the unreachable node. */
static dict *clusterManagerGetLinkStatus(void) { static dict *clusterManagerGetLinkStatus(void) {
if (cluster_manager.nodes == NULL) return NULL; if (cluster_manager.nodes == NULL) return NULL;
dictType dtype = clusterManagerDictType; dict *status = dictCreate(&clusterManagerLinkDictType, NULL);
dtype.keyDestructor = dictSdsDestructor;
dtype.valDestructor = dictListDestructor;
dict *status = dictCreate(&dtype, NULL);
listIter li; listIter li;
listNode *ln; listNode *ln;
listRewind(cluster_manager.nodes, &li); listRewind(cluster_manager.nodes, &li);