gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All tests runs pass! YAYgit add src/cluster.c src/config.c !

Browse Source 
Former-commit-id: 59051dd59d90714a13d6e3676f9691b2220b39c3
This commit is contained in:
John Sully 2019-04-04 01:02:19 -04:00
parent 0e47f7dd52
commit cddcd632ca
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cluster.c
View File

@ -436,6 +436,11 @@ void clusterUpdateMyselfFlags(void) {
void clusterInit(void) { void clusterInit(void) {
int saveconf = 0; 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 = zmalloc(sizeof(clusterState), MALLOC_LOCAL);
server.cluster->myself = NULL; server.cluster->myself = NULL;
@ -1507,7 +1512,6 @@ int nodeUpdateAddressIfNeeded(clusterNode *node, clusterLink *link,
if (nodeIsSlave(myself) && myself->slaveof == node) if (nodeIsSlave(myself) && myself->slaveof == node)
{ {
serverAssert(listLength(server.masters) == 1); serverAssert(listLength(server.masters) == 1);
replicationUnsetMaster(listFirst(server.masters)->value);
replicationAddMaster(node->ip, node->port); replicationAddMaster(node->ip, node->port);
} }
@ -3580,9 +3584,6 @@ void clusterCron(void) {
myself->slaveof && myself->slaveof &&
nodeHasAddr(myself->slaveof)) nodeHasAddr(myself->slaveof))
{ {
struct redisMaster *mi = getFirstMaster();
if (mi != NULL)
replicationUnsetMaster(mi);
replicationAddMaster(myself->slaveof->ip, myself->slaveof->port); replicationAddMaster(myself->slaveof->ip, myself->slaveof->port);
} }
@ -3963,8 +3964,6 @@ void clusterSetMaster(clusterNode *n) {
} }
myself->slaveof = n; myself->slaveof = n;
clusterNodeAddSlave(n,myself); clusterNodeAddSlave(n,myself);
if (listLength(server.masters))
replicationUnsetMaster(getFirstMaster());
replicationAddMaster(n->ip, n->port); replicationAddMaster(n->ip, n->port);
resetManualFailover(); resetManualFailover();
} }

2
src/config.c
View File

@ -1623,10 +1623,10 @@ void configGetCommand(client *c) {
char *optname = stringmatch(pattern,"slaveof",1) ? char *optname = stringmatch(pattern,"slaveof",1) ?
"slaveof" : "replicaof"; "slaveof" : "replicaof";
char buf[256]; char buf[256];
addReplyBulkCString(c,optname);
if (listLength(server.masters) == 0) if (listLength(server.masters) == 0)
{ {
buf[0] = '\0'; buf[0] = '\0';
addReplyBulkCString(c,optname);
addReplyBulkCString(c,buf); addReplyBulkCString(c,buf);
} }
else else