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

Fix galeramon regression

Browse Source 
The comparisons were done wrong: strcasecmp returns 0 for equal strings.
This commit is contained in:
Markus Mäkelä
2019-05-21 16:44:34 +03:00
parent e545e2ac5c
commit 17fa1ce616
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,8 +277,7 @@ void GaleraMonitor::update_server_status(MonitorServer* 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") if (config_truth_value(row[1]))
|| strcasecmp(row[1], "1") || strcasecmp(row[1], "true"))
{ {
info.joined = 0; info.joined = 0;
} }
@ -287,7 +286,7 @@ void GaleraMonitor::update_server_status(MonitorServer* monitored_server)
/* 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;
} }
@ -296,8 +295,7 @@ void GaleraMonitor::update_server_status(MonitorServer* monitored_server)
/* 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") if (config_truth_value(row[1]))
|| strcasecmp(row[1], "1") || strcasecmp(row[1], "true"))
{ {
info.joined = 0; info.joined = 0;
} }
@ -306,8 +304,7 @@ void GaleraMonitor::update_server_status(MonitorServer* monitored_server)
/* 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") if (!config_truth_value(row[1]))
|| strcasecmp(row[1], "0") || strcasecmp(row[1], "false"))
{ {
info.joined = 0; info.joined = 0;
} }