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

Fix galeramon regression

Browse Source 
The comparisons were wrong: strcasecmp returns 0 for equal strings.
This commit is contained in:
Markus Mäkelä
2019-05-09 12:05:22 +03:00
parent 59f2145c00
commit 567ad9b8b8
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/modules/monitor/galeramon/galeramon.cc
View File

@ -215,37 +215,41 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
/* Node is in desync - lets take it offline */ /* Node is in desync - lets take it offline */
if (strcmp(row[0], "wsrep_desync") == 0) if (strcmp(row[0], "wsrep_desync") == 0)
{ {
if (strcasecmp(row[1],"YES") || strcasecmp(row[1],"ON") || strcasecmp(row[1],"1") || strcasecmp(row[1],"true")) if (strcasecmp(row[1], "YES") == 0 || strcasecmp(row[1], "ON") == 0
{ || strcasecmp(row[1], "1") == 0 || strcasecmp(row[1], "true") == 0)
info.joined = 0; {
} info.joined = 0;
}
} }
/* Node rejects queries - lets take it offline */ /* Node rejects queries - lets take it offline */
if (strcmp(row[0], "wsrep_reject_queries") == 0) if (strcmp(row[0], "wsrep_reject_queries") == 0)
{ {
if (strcasecmp(row[1],"ALL") || strcasecmp(row[1],"ALL_KILL")) if (strcasecmp(row[1], "ALL") == 0
{ || strcasecmp(row[1], "ALL_KILL") == 0)
info.joined = 0; {
} info.joined = 0;
}
} }
/* Node rejects queries - lets take it offline */ /* Node rejects queries - lets take it offline */
if (strcmp(row[0], "wsrep_sst_donor_rejects_queries") == 0) if (strcmp(row[0], "wsrep_sst_donor_rejects_queries") == 0)
{ {
if (strcasecmp(row[1],"YES") || strcasecmp(row[1],"ON") || strcasecmp(row[1],"1") || strcasecmp(row[1],"true")) if (strcasecmp(row[1], "YES") == 0 || strcasecmp(row[1], "ON") == 0
{ || strcasecmp(row[1], "1") == 0 || strcasecmp(row[1], "true") == 0)
info.joined = 0; {
} info.joined = 0;
}
} }
/* Node is not ready - lets take it offline */ /* Node is not ready - lets take it offline */
if (strcmp(row[0], "wsrep_ready") == 0) if (strcmp(row[0], "wsrep_ready") == 0)
{ {
if (strcasecmp(row[1],"NO") || strcasecmp(row[1],"OFF") || strcasecmp(row[1],"0") || strcasecmp(row[1],"false")) if (strcasecmp(row[1], "NO") == 0 || strcasecmp(row[1], "OFF") == 0
{ || strcasecmp(row[1], "0") == 0 || strcasecmp(row[1], "false") == 0)
info.joined = 0; {
} info.joined = 0;
}
} }
if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0 && row[1] && *row[1]) if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0 && row[1] && *row[1])