gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Don't crash when adding a forgotten node to blacklist twice (#12702)

Browse Source 
Add a defensive checks to prevent double freeing a node from the cluster blacklist.

(cherry picked from commit 8d675950e6528e164454300d54aaf7bc024b075c)
This commit is contained in:
Viktor Söderqvist 2023-10-31 15:20:06 +01:00 committed by Oran Agra
parent cf013b83df
commit cee6d309d9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cluster.c
View File

@ -1134,6 +1134,9 @@ void clusterReset(int hard) {
} }
dictReleaseIterator(di); dictReleaseIterator(di);
/* Empty the nodes blacklist. */
dictEmpty(server.cluster->nodes_black_list, NULL);
/* Hard reset only: set epochs to 0, change node ID. */ /* Hard reset only: set epochs to 0, change node ID. */
if (hard) { if (hard) {
sds oldname; sds oldname;
@ -2655,8 +2658,7 @@ void clusterProcessPingExtensions(clusterMsg *hdr, clusterLink *link) {
clusterNode *n = clusterLookupNode(forgotten_node_ext->name, CLUSTER_NAMELEN); clusterNode *n = clusterLookupNode(forgotten_node_ext->name, CLUSTER_NAMELEN);
if (n && n != myself && !(nodeIsSlave(myself) && myself->slaveof == n)) { if (n && n != myself && !(nodeIsSlave(myself) && myself->slaveof == n)) {
sds id = sdsnewlen(forgotten_node_ext->name, CLUSTER_NAMELEN); sds id = sdsnewlen(forgotten_node_ext->name, CLUSTER_NAMELEN);
dictEntry *de = dictAddRaw(server.cluster->nodes_black_list, id, NULL); dictEntry *de = dictAddOrFind(server.cluster->nodes_black_list, id);
serverAssert(de != NULL);
uint64_t expire = server.unixtime + ntohu64(forgotten_node_ext->ttl); uint64_t expire = server.unixtime + ntohu64(forgotten_node_ext->ttl);
dictSetUnsignedIntegerVal(de, expire); dictSetUnsignedIntegerVal(de, expire);
clusterDelNode(n); clusterDelNode(n);