caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cluster: clusterSetStartupEpoch() made more generally useful.

Browse Source 
The actual goal of the function was to get the max configEpoch found in
the cluster, so make it general by removing the assignment of the max
epoch to currentEpoch that is useful only at startup.
This commit is contained in:
antirez 2014-02-11 10:00:11 +01:00
parent 44f7afe28a
commit 72f7abf6a2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cluster.c
View File

@ -73,21 +73,19 @@ void resetManualFailover(void);
* Initialization * Initialization
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/* This function is called at startup in order to set the currentEpoch /* Return the greatest configEpoch found in the cluster. */
* (which is not saved on permanent storage) to the greatest configEpoch found uint64_t clusterGetMaxEpoch(void) {
* in the loaded nodes (configEpoch is stored on permanent storage as soon as uint64_t max = 0;
* it changes for some node). */
void clusterSetStartupEpoch() {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
di = dictGetSafeIterator(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);
if (node->configEpoch > server.cluster->currentEpoch) if (node->configEpoch > max) max = node->configEpoch;
server.cluster->currentEpoch = node->configEpoch;
} }
dictReleaseIterator(di); dictReleaseIterator(di);
return max;
} }
int clusterLoadConfig(char *filename) { int clusterLoadConfig(char *filename) {
@ -227,7 +225,10 @@ int clusterLoadConfig(char *filename) {
/* Config sanity check */ /* Config sanity check */
redisAssert(server.cluster->myself != NULL); redisAssert(server.cluster->myself != NULL);
redisLog(REDIS_NOTICE,"Node configuration loaded, I'm %.40s", myself->name); redisLog(REDIS_NOTICE,"Node configuration loaded, I'm %.40s", myself->name);
clusterSetStartupEpoch(); /* Set the currentEpoch to the max epoch found in the master.
* FIXME: this should actually be part of the persistent state, as
* documented in the Github issue #1479. */
server.cluster->currentEpoch = clusterGetMaxEpoch();
return REDIS_OK; return REDIS_OK;
fmterr: fmterr: