diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2020-01-08 12:30:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 12:30:49 +0100 |
| commit | 0e38c5f39c7370690e1afe8d8c213d27842c5571 (patch) | |
| tree | 7420400d6a065622a2172e840ed728b232d37398 | |
| parent | 7080a28efc28bd3a3004bd37c9b85d58233fc1ed (diff) | |
| parent | 18c26760846fa51aee4ad5d6c4a6d06c64d7269e (diff) | |
| download | redis-0e38c5f39c7370690e1afe8d8c213d27842c5571.tar.gz | |
Merge pull request #6743 from yz1509/unstable
Sentinel: avoid sentinel changes promoted_slave to be its own replica.
| -rw-r--r-- | src/sentinel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sentinel.c b/src/sentinel.c index 10117252d..10c003d03 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -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, |