Commit e5d5da6f authored by antirez's avatar antirez
Browse files

Cluster: always use safe iteartors to iterate server.cluster->nodes.

parent 43fe2d0d
...@@ -545,7 +545,7 @@ void clusterDelNode(clusterNode *delnode) { ...@@ -545,7 +545,7 @@ void clusterDelNode(clusterNode *delnode) {
} }
/* 2) Remove failure reports. */ /* 2) Remove failure reports. */
di = dictGetIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
...@@ -1234,7 +1234,7 @@ void clusterBroadcastMessage(void *buf, size_t len) { ...@@ -1234,7 +1234,7 @@ void clusterBroadcastMessage(void *buf, size_t len) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
di = dictGetIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
...@@ -1346,7 +1346,7 @@ void clusterBroadcastPong(void) { ...@@ -1346,7 +1346,7 @@ void clusterBroadcastPong(void) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
di = dictGetIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
...@@ -1647,7 +1647,7 @@ void clusterCron(void) { ...@@ -1647,7 +1647,7 @@ void clusterCron(void) {
} }
/* Iterate nodes to check if we need to flag something as failing */ /* 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) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
time_t now = time(NULL); time_t now = time(NULL);
...@@ -1849,7 +1849,7 @@ void clusterUpdateState(void) { ...@@ -1849,7 +1849,7 @@ void clusterUpdateState(void) {
dictEntry *de; dictEntry *de;
server.cluster->size = 0; server.cluster->size = 0;
di = dictGetIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
...@@ -1978,7 +1978,7 @@ sds clusterGenNodesDescription(void) { ...@@ -1978,7 +1978,7 @@ sds clusterGenNodesDescription(void) {
dictEntry *de; dictEntry *de;
int j, start; int j, start;
di = dictGetIterator(server.cluster->nodes); di = dictGetSafeIterator(server.cluster->nodes);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
clusterNode *node = dictGetVal(de); clusterNode *node = dictGetVal(de);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment