fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-05-10 09:47:12 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: swap two code blocks to have a more obvious flow.

Browse Source
This commit is contained in:
antirez 2014-01-30 16:34:23 +01:00
parent 4beaaff8ea
commit 5b4020fb42
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cluster.c
View File

@ -1964,14 +1964,6 @@ void clusterHandleSlaveFailover(void) {
int needed_quorum = (server.cluster->size / 2) + 1; int needed_quorum = (server.cluster->size / 2) + 1;
int j; int j;
/* Set data_age to the number of seconds we are disconnected from
* the master. */
if (server.repl_state == REDIS_REPL_CONNECTED) {
data_age = (server.unixtime - server.master->lastinteraction) * 1000;
} else {
data_age = (server.unixtime - server.repl_down_since) * 1000;
}
/* Pre conditions to run the function: /* Pre conditions to run the function:
* 1) We are a slave. * 1) We are a slave.
* 2) Our master is flagged as FAIL. * 2) Our master is flagged as FAIL.
@ -1981,6 +1973,14 @@ void clusterHandleSlaveFailover(void) {
!nodeFailed(myself->slaveof) || !nodeFailed(myself->slaveof) ||
myself->slaveof->numslots == 0) return; myself->slaveof->numslots == 0) return;
/* Set data_age to the number of seconds we are disconnected from
* the master. */
if (server.repl_state == REDIS_REPL_CONNECTED) {
data_age = (server.unixtime - server.master->lastinteraction) * 1000;
} else {
data_age = (server.unixtime - server.repl_down_since) * 1000;
}
/* Remove the node timeout from the data age as it is fine that we are /* Remove the node timeout from the data age as it is fine that we are
* disconnected from our master at least for the time it was down to be * disconnected from our master at least for the time it was down to be
* flagged as FAIL, that's the baseline. */ * flagged as FAIL, that's the baseline. */