hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Galera cluster status is Synced, all affected files are updated

Browse Source
This commit is contained in:
Massimiliano Pinto
2013-10-14 15:29:26 +02:00
parent 66dbb8ec23
commit 121cff7ffa
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/server.c
View File

@ -244,7 +244,7 @@ char *status = NULL;
if (server->status & SERVER_SLAVE) if (server->status & SERVER_SLAVE)
strcat(status, "Slave, "); strcat(status, "Slave, ");
if (server->status & SERVER_JOINED) if (server->status & SERVER_JOINED)
strcat(status, "Joined, "); strcat(status, "Synced, ");
if (server->status & SERVER_RUNNING) if (server->status & SERVER_RUNNING)
strcat(status, "Running"); strcat(status, "Running");
else else

2
server/modules/monitor/galera_mon.c
View File

@ -309,7 +309,7 @@ char *uname = defaultUser, *passwd = defaultPasswd;
num_fields = mysql_num_fields(result); num_fields = mysql_num_fields(result);
while ((row = mysql_fetch_row(result))) while ((row = mysql_fetch_row(result)))
{ {
if (strncasecmp(row[1], "JOINED", 3) == 0) if (strncasecmp(row[1], "SYNCED", 3) == 0)
isjoined = 1; isjoined = 1;
} }
mysql_free_result(result); mysql_free_result(result);

2
server/modules/routing/debugcmd.c
View File

@ -544,7 +544,7 @@ static struct {
{ "running", SERVER_RUNNING }, { "running", SERVER_RUNNING },
{ "master", SERVER_MASTER }, { "master", SERVER_MASTER },
{ "slave", SERVER_SLAVE }, { "slave", SERVER_SLAVE },
{ "joined", SERVER_JOINED }, { "synced", SERVER_JOINED },
{ NULL, 0 } { NULL, 0 }
}; };
/** /**

2
server/modules/routing/readconnroute.c
View File

@ -225,7 +225,7 @@ int i, n;
inst->bitmask |= (SERVER_MASTER|SERVER_SLAVE); inst->bitmask |= (SERVER_MASTER|SERVER_SLAVE);
inst->bitvalue |= SERVER_SLAVE; inst->bitvalue |= SERVER_SLAVE;
} }
else if (!strcasecmp(options[i], "joined")) else if (!strcasecmp(options[i], "synced"))
{ {
inst->bitmask |= (SERVER_JOINED); inst->bitmask |= (SERVER_JOINED);
inst->bitvalue |= SERVER_JOINED; inst->bitvalue |= SERVER_JOINED;

2
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -227,7 +227,7 @@ static ROUTER* createInstance(
router->bitmask |= (SERVER_MASTER|SERVER_SLAVE); router->bitmask |= (SERVER_MASTER|SERVER_SLAVE);
router->bitvalue |= SERVER_SLAVE; router->bitvalue |= SERVER_SLAVE;
} }
else if (!strcasecmp(options[i], "joined")) else if (!strcasecmp(options[i], "synced"))
{ {
router->bitmask |= (SERVER_JOINED); router->bitmask |= (SERVER_JOINED);
router->bitvalue |= SERVER_JOINED; router->bitvalue |= SERVER_JOINED;