From e5d5da6f7c3f40ccf3ea3d1cbf72fbd3943f0ee9 Mon Sep 17 00:00:00 2001 From: antirez Date: Wed, 4 Sep 2013 10:07:50 +0200 Subject: [PATCH] Cluster: always use safe iteartors to iterate server.cluster->nodes. --- src/cluster.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cluster.c b/src/cluster.c index b0b24c5d..6cd2eed3 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -545,7 +545,7 @@ void clusterDelNode(clusterNode *delnode) { } /* 2) Remove failure reports. */ - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de); @@ -1234,7 +1234,7 @@ void clusterBroadcastMessage(void *buf, size_t len) { dictIterator *di; dictEntry *de; - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de); @@ -1346,7 +1346,7 @@ void clusterBroadcastPong(void) { dictIterator *di; dictEntry *de; - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de); @@ -1647,7 +1647,7 @@ void clusterCron(void) { } /* Iterate nodes to check if we need to flag something as failing */ - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de); time_t now = time(NULL); @@ -1849,7 +1849,7 @@ void clusterUpdateState(void) { dictEntry *de; server.cluster->size = 0; - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de); @@ -1978,7 +1978,7 @@ sds clusterGenNodesDescription(void) { dictEntry *de; int j, start; - di = dictGetIterator(server.cluster->nodes); + di = dictGetSafeIterator(server.cluster->nodes); while((de = dictNext(di)) != NULL) { clusterNode *node = dictGetVal(de);