From 17592f1da3a95648651ef63c6e4ed936af41e3b4 Mon Sep 17 00:00:00 2001 From: John Sully Date: Thu, 17 Sep 2020 00:31:10 +0000 Subject: [PATCH] master_global_link_status should respect the quorum Former-commit-id: f5ecc77e298d980f73ab34f7f1984bc7b9d451f4 --- src/server.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index c11ede661..1a2104896 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -4643,17 +4643,8 @@ sds genRedisInfoString(const char *section) { listLength(g_pserver->masters) == 0 ? "master" : g_pserver->fActiveReplica ? "active-replica" : "slave"); if (listLength(g_pserver->masters)) { - listIter li; - listNode *ln; - listRewind(g_pserver->masters, &li); - bool fAllUp = true; - while ((ln = listNext(&li))) { - redisMaster *mi = (redisMaster*)listNodeValue(ln); - fAllUp = fAllUp && mi->repl_state == REPL_STATE_CONNECTED; - } - info = sdscatprintf(info, "master_global_link_status:%s\r\n", - fAllUp ? "up" : "down"); + FBrokenLinkToMaster() ? "down" : "up"); int cmasters = 0; listRewind(g_pserver->masters, &li);