fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-01 15:21:03 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: fix reported role info sampling.

Browse Source 
The way the role change was recoded was not sane and too much
convoluted, causing the role information to be not always updated.

This commit fixes issue #1445.
This commit is contained in:
antirez 2013-12-06 12:46:56 +01:00
parent 2b414a4b5f
commit c590549e40
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sentinel.c
View File

@ -1762,22 +1762,22 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
* Some things will not happen if sentinel.tilt is true, but some will * Some things will not happen if sentinel.tilt is true, but some will
* still be processed. */ * still be processed. */
/* Remember when the role changed. */
if (role != ri->role_reported) {
ri->role_reported_time = mstime();
ri->role_reported = role;
if (role == SRI_SLAVE) ri->slave_conf_change_time = mstime();
}
/* Handle master -> slave role switch. */ /* Handle master -> slave role switch. */
if ((ri->flags & SRI_MASTER) && role == SRI_SLAVE) { if ((ri->flags & SRI_MASTER) && role == SRI_SLAVE) {
if (ri->role_reported != SRI_SLAVE) { /* Nothing to do, but masters claiming to be slaves are
ri->role_reported_time = mstime(); * considered to be unreachable by Sentinel, so eventually
ri->role_reported = SRI_SLAVE; * a failover will be triggered. */
ri->slave_conf_change_time = mstime();
}
} }
/* Handle slave -> master role switch. */ /* Handle slave -> master role switch. */
if ((ri->flags & SRI_SLAVE) && role == SRI_MASTER) { if ((ri->flags & SRI_SLAVE) && role == SRI_MASTER) {
if (ri->role_reported != SRI_MASTER) {
ri->role_reported_time = mstime();
ri->role_reported = SRI_MASTER;
}
/* If this is a promoted slave we can change state to the /* If this is a promoted slave we can change state to the
* failover state machine. */ * failover state machine. */
if (!sentinel.tilt && if (!sentinel.tilt &&