Merge pull request #6743 from yz1509/unstable

Sentinel: avoid sentinel changes promoted_slave to be its own replica.
This commit is contained in:
Salvatore Sanfilippo 2020-01-08 12:30:49 +01:00 committed by GitHub
commit 68b2c53f7f

View File

@ -4308,7 +4308,7 @@ void sentinelFailoverDetectEnd(sentinelRedisInstance *master) {
sentinelRedisInstance *slave = dictGetVal(de);
int retval;
if (slave->flags & (SRI_RECONF_DONE|SRI_RECONF_SENT)) continue;
if (slave->flags & (SRI_PROMOTED|SRI_RECONF_DONE|SRI_RECONF_SENT)) continue;
if (slave->link->disconnected) continue;
retval = sentinelSendSlaveOf(slave,