fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

- Cluster Manager: fixed various memory leaks

Browse Source 
- Cluster Manager: fixed flags assignment in
  clusterManagerNodeLoadInfo
This commit is contained in:
artix 2018-01-31 19:25:02 +01:00
parent 8c7ad80f9f
commit b3e0ca3412
1 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/redis-cli.c
View File

@ -2310,12 +2310,6 @@ static int clusterManagerNodeLoadInfo(clusterManagerNode *node, int opts,
} }
if (!flags) goto node_cmd_err; if (!flags) goto node_cmd_err;
int myself = (strstr(flags, "myself") != NULL); int myself = (strstr(flags, "myself") != NULL);
if (strstr(flags, "noaddr") != NULL)
node->flags |= CLUSTER_MANAGER_FLAG_NOADDR;
if (strstr(flags, "disconnected") != NULL)
node->flags |= CLUSTER_MANAGER_FLAG_DISCONNECT;
if (strstr(flags, "fail") != NULL)
node->flags |= CLUSTER_MANAGER_FLAG_FAIL;
clusterManagerNode *currentNode = NULL; clusterManagerNode *currentNode = NULL;
if (myself) { if (myself) {
node->flags |= CLUSTER_MANAGER_FLAG_MYSELF; node->flags |= CLUSTER_MANAGER_FLAG_MYSELF;
@ -2396,10 +2390,22 @@ static int clusterManagerNodeLoadInfo(clusterManagerNode *node, int opts,
if (node->friends == NULL) node->friends = listCreate(); if (node->friends == NULL) node->friends = listCreate();
listAddNodeTail(node->friends, currentNode); listAddNodeTail(node->friends, currentNode);
} }
if (name != NULL) currentNode->name = sdsnew(name); if (name != NULL) {
if (currentNode->name) sdsfree(currentNode->name);
currentNode->name = sdsnew(name);
}
if (strstr(flags, "noaddr") != NULL)
currentNode->flags |= CLUSTER_MANAGER_FLAG_NOADDR;
if (strstr(flags, "disconnected") != NULL)
currentNode->flags |= CLUSTER_MANAGER_FLAG_DISCONNECT;
if (strstr(flags, "fail") != NULL)
currentNode->flags |= CLUSTER_MANAGER_FLAG_FAIL;
if (strstr(flags, "slave") != NULL) { if (strstr(flags, "slave") != NULL) {
currentNode->flags |= CLUSTER_MANAGER_FLAG_SLAVE; currentNode->flags |= CLUSTER_MANAGER_FLAG_SLAVE;
if (master_id != NULL) currentNode->replicate = sdsnew(master_id); if (master_id != NULL) {
if (currentNode->replicate) sdsfree(currentNode->replicate);
currentNode->replicate = sdsnew(master_id);
}
} }
if (config_epoch != NULL) if (config_epoch != NULL)
currentNode->current_epoch = atoll(config_epoch); currentNode->current_epoch = atoll(config_epoch);
@ -2442,27 +2448,39 @@ static int clusterManagerLoadInfoFromNode(clusterManagerNode *node, int opts) {
freeClusterManagerNode(node); freeClusterManagerNode(node);
return 0; return 0;
} }
listIter li;
listNode *ln;
if (cluster_manager.nodes != NULL) {
listRewind(cluster_manager.nodes, &li);
while ((ln = listNext(&li)) != NULL)
freeClusterManagerNode((clusterManagerNode *) ln->value);
listRelease(cluster_manager.nodes);
}
cluster_manager.nodes = listCreate(); cluster_manager.nodes = listCreate();
listAddNodeTail(cluster_manager.nodes, node); listAddNodeTail(cluster_manager.nodes, node);
if (node->friends != NULL) { if (node->friends != NULL) {
listIter li;
listNode *ln;
listRewind(node->friends, &li); listRewind(node->friends, &li);
while ((ln = listNext(&li)) != NULL) { while ((ln = listNext(&li)) != NULL) {
clusterManagerNode *friend = ln->value; clusterManagerNode *friend = ln->value;
if (!friend->ip || !friend->port) continue; if (!friend->ip || !friend->port) goto invalid_friend;
if (!friend->context) if (!friend->context)
friend->context = redisConnect(friend->ip, friend->port); friend->context = redisConnect(friend->ip, friend->port);
if (friend->context->err) continue; if (friend->context->err) goto invalid_friend;
e = NULL; e = NULL;
if (clusterManagerNodeLoadInfo(friend, 0, &e)) { if (clusterManagerNodeLoadInfo(friend, 0, &e)) {
if (friend->flags & (CLUSTER_MANAGER_FLAG_NOADDR | if (friend->flags & (CLUSTER_MANAGER_FLAG_NOADDR |
CLUSTER_MANAGER_FLAG_DISCONNECT | CLUSTER_MANAGER_FLAG_DISCONNECT |
CLUSTER_MANAGER_FLAG_FAIL)) continue; CLUSTER_MANAGER_FLAG_FAIL))
goto invalid_friend;
listAddNodeTail(cluster_manager.nodes, friend); listAddNodeTail(cluster_manager.nodes, friend);
} else {
} else fprintf(stderr,"[ERR] Unable to load info for node %s:%d\n", fprintf(stderr,"[ERR] Unable to load info for node %s:%d\n",
friend->ip, friend->port); friend->ip, friend->port);
goto invalid_friend;
}
continue;
invalid_friend:
freeClusterManagerNode(friend);
} }
listRelease(node->friends); listRelease(node->friends);
node->friends = NULL; node->friends = NULL;
@ -2601,6 +2619,7 @@ static void clusterManagerCheckCluster(int quiet) {
CLUSTER_MANAGER_ERROR(err); CLUSTER_MANAGER_ERROR(err);
} else printf("[OK] All nodes agree about slots configuration.\n"); } else printf("[OK] All nodes agree about slots configuration.\n");
// Check open slots // Check open slots
printf(">>> Check for open slots...\n");
listIter li; listIter li;
listRewind(cluster_manager.nodes, &li); listRewind(cluster_manager.nodes, &li);
int i; int i;
@ -2836,6 +2855,7 @@ assign_replicas:
if (slave != NULL) { if (slave != NULL) {
assigned_replicas++; assigned_replicas++;
available_count--; available_count--;
if (slave->replicate) sdsfree(slave->replicate);
slave->replicate = sdsnew(master->name); slave->replicate = sdsnew(master->name);
slave->dirty = 1; slave->dirty = 1;
} else break; } else break;
@ -2873,7 +2893,7 @@ assign_replicas:
zfree(err); zfree(err);
} }
goto cmd_err; goto cmd_err;
} } else if (err != NULL) zfree(err);
} }
printf(">>> Nodes configuration updated\n"); printf(">>> Nodes configuration updated\n");
printf(">>> Assign a different config epoch to each node\n"); printf(">>> Assign a different config epoch to each node\n");