From ce7b838fb9a06aae7b0fcac8617577700fc89917 Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 26 Jul 2012 12:09:40 +0200 Subject: [PATCH] Sentinel: don't start a failover as leader if there is no good slave. --- src/sentinel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sentinel.c b/src/sentinel.c index 227fb693..24bf993f 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -294,6 +294,7 @@ void sentinelKillLink(sentinelRedisInstance *ri, redisAsyncContext *c); const char *sentinelRedisInstanceTypeStr(sentinelRedisInstance *ri); void sentinelAbortFailover(sentinelRedisInstance *ri); void sentinelEvent(int level, char *type, sentinelRedisInstance *ri, const char *fmt, ...); +sentinelRedisInstance *sentinelSelectSlave(sentinelRedisInstance *master); /* ========================= Dictionary types =============================== */ @@ -2061,7 +2062,11 @@ void sentinelStartFailover(sentinelRedisInstance *master) { SRI_RECONF_SENT); } } else { - /* Brand new failover as SRI_FAILOVER_IN_PROGRESS was not set. */ + /* Brand new failover as SRI_FAILOVER_IN_PROGRESS was not set. + * + * Do we have a slave to promote? Otherwise don't start a failover + * at all. */ + if (sentinelSelectSlave(master) == NULL) return; master->failover_state = SENTINEL_FAILOVER_STATE_WAIT_START; } -- 2.49.0