fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: safer slave reconfig, master reported role should match.

Browse Source
This commit is contained in:
antirez 2013-11-13 17:02:09 +01:00
parent ddaad9fe2d
commit 76a88f56e5
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sentinel.c
View File

@ -1605,6 +1605,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
/* Make sure the master is sane before reconfiguring this instance /* Make sure the master is sane before reconfiguring this instance
* into a slave. */ * into a slave. */
if (ri->master->flags & SRI_MASTER && if (ri->master->flags & SRI_MASTER &&
ri->master->role_reported == SRI_MASTER &&
(ri->master->flags & (SRI_S_DOWN|SRI_O_DOWN)) == 0 && (ri->master->flags & (SRI_S_DOWN|SRI_O_DOWN)) == 0 &&
(mstime() - ri->master->info_refresh) < SENTINEL_INFO_PERIOD*2) (mstime() - ri->master->info_refresh) < SENTINEL_INFO_PERIOD*2)
{ {