Merge pull request #3274 from MOON-CLJ/fix_promoted_slave

Sentinel: fix check when can't send the command to the promoted slave
This commit is contained in:
Salvatore Sanfilippo 2016-06-15 17:24:11 +02:00 committed by GitHub
commit 5d83f6cfde

View File

@ -3996,7 +3996,7 @@ void sentinelFailoverSendSlaveOfNoOne(sentinelRedisInstance *ri) {
/* We can't send the command to the promoted slave if it is now
* disconnected. Retry again and again with this state until the timeout
* is reached, then abort the failover. */
if (ri->link->disconnected) {
if (ri->promoted_slave->link->disconnected) {
if (mstime() - ri->failover_state_change_time > ri->failover_timeout) {
sentinelEvent(LL_WARNING,"-failover-abort-slave-timeout",ri,"%@");
sentinelAbortFailover(ri);