From cddcd632ca083ffde9d8ac875dacf64b25ac30c0 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 4 Apr 2019 01:02:19 -0400
Subject: [PATCH] All tests runs pass! YAYgit add src/cluster.c src/config.c !

Former-commit-id: 59051dd59d90714a13d6e3676f9691b2220b39c3
---
 src/cluster.c | 11 +++++------
 src/config.c  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/cluster.c b/src/cluster.c
index e4b5d4dc5..5448fa434 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -436,6 +436,11 @@ void clusterUpdateMyselfFlags(void) {
 
 void clusterInit(void) {
     int saveconf = 0;
+    if (server.enable_multimaster)
+    {
+        serverLog(LL_WARNING, "Clusters are not compatible with multi-master");
+        exit(EXIT_FAILURE);
+    }
 
     server.cluster = zmalloc(sizeof(clusterState), MALLOC_LOCAL);
     server.cluster->myself = NULL;
@@ -1507,7 +1512,6 @@ int nodeUpdateAddressIfNeeded(clusterNode *node, clusterLink *link,
     if (nodeIsSlave(myself) && myself->slaveof == node)
     {
         serverAssert(listLength(server.masters) == 1);
-        replicationUnsetMaster(listFirst(server.masters)->value);
         replicationAddMaster(node->ip, node->port);
     }
         
@@ -3580,9 +3584,6 @@ void clusterCron(void) {
         myself->slaveof &&
         nodeHasAddr(myself->slaveof))
     {
-        struct redisMaster *mi = getFirstMaster();
-        if (mi != NULL)
-            replicationUnsetMaster(mi);
         replicationAddMaster(myself->slaveof->ip, myself->slaveof->port);
     }
 
@@ -3963,8 +3964,6 @@ void clusterSetMaster(clusterNode *n) {
     }
     myself->slaveof = n;
     clusterNodeAddSlave(n,myself);
-    if (listLength(server.masters))
-        replicationUnsetMaster(getFirstMaster());
     replicationAddMaster(n->ip, n->port);
     resetManualFailover();
 }
diff --git a/src/config.c b/src/config.c
index 162165c1d..9852bbc6d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1623,10 +1623,10 @@ void configGetCommand(client *c) {
         char *optname = stringmatch(pattern,"slaveof",1) ?
                         "slaveof" : "replicaof";
         char buf[256];
+        addReplyBulkCString(c,optname);
         if (listLength(server.masters) == 0)
         {
             buf[0] = '\0';
-            addReplyBulkCString(c,optname);
             addReplyBulkCString(c,buf);
         }
         else