fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Cluster: fixed data_age computation / check integer overflow.

Browse Source
This commit is contained in:
antirez 2014-05-12 17:43:36 +02:00
parent 2692339138
commit 832a298005
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cluster.c
View File

@ -2318,9 +2318,10 @@ void clusterHandleSlaveFailover(void) {
/* Set data_age to the number of seconds we are disconnected from /* Set data_age to the number of seconds we are disconnected from
* the master. */ * the master. */
if (server.repl_state == REDIS_REPL_CONNECTED) { if (server.repl_state == REDIS_REPL_CONNECTED) {
data_age = (server.unixtime - server.master->lastinteraction) * 1000; data_age = (mstime_t)(server.unixtime - server.master->lastinteraction)
* 1000;
} else { } else {
data_age = (server.unixtime - server.repl_down_since) * 1000; data_age = (mstime_t)(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
@ -2335,7 +2336,7 @@ void clusterHandleSlaveFailover(void) {
* *
* Check bypassed for manual failovers. */ * Check bypassed for manual failovers. */
if (data_age > if (data_age >
(server.repl_ping_slave_period * 1000) + ((mstime_t)server.repl_ping_slave_period * 1000) +
(server.cluster_node_timeout * REDIS_CLUSTER_SLAVE_VALIDITY_MULT)) (server.cluster_node_timeout * REDIS_CLUSTER_SLAVE_VALIDITY_MULT))
{ {
if (!manual_failover) return; if (!manual_failover) return;