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

MXS-656: Galera nodes with index 0 can be master again

Browse Source 
The index calculation falsely ignored nodes with node index 0 when errno
was non-zero.
This commit is contained in:
Markus Makela
2016-04-04 10:48:44 +03:00
parent bda0c0b013
commit fb6b3e6702
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/galeramon.c
View File

@ -397,10 +397,12 @@ monitorDatabase(MONITOR *mon, MONITOR_SERVERS *database)
while ((row = mysql_fetch_row(result))) while ((row = mysql_fetch_row(result)))
{ {
local_index = strtol(row[1], NULL, 10); char* endchar;
if ((errno == ERANGE && (local_index == LONG_MAX local_index = strtol(row[1], &endchar, 10);
|| local_index == LONG_MIN)) || (errno != 0 && local_index == 0)) if (*endchar != '\0' ||
(errno == ERANGE && (local_index == LONG_MAX || local_index == LONG_MIN)))
{ {
ss_dassert(false);
local_index = -1; local_index = -1;
} }
database->server->node_id = local_index; database->server->node_id = local_index;