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

MXS-173 Initial version of throttle filter

Browse Source
This commit is contained in:
Niclas Antti
2018-04-24 11:28:09 +03:00
parent 62a3dd664d
commit 02b6cd7004
12 changed files with 939 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -824,8 +824,8 @@ bool MariaDBMonitor::switchover_demote_master(MariaDBServer* current_master, jso
}
else
{
const char GTID_ERROR[] = "Demotion failed due to an error in updating gtid:s. "
"Check log for more details.";
const char * const GTID_ERROR = "Demotion failed due to an error in updating gtid:s. "
"Check log for more details.";
PRINT_MXS_JSON_ERROR(err_out, GTID_ERROR);
}
}
@ -1465,7 +1465,7 @@ static void print_redirect_errors(MariaDBServer* first_server, const ServerArray
{
// Individual server errors have already been printed to the log.
// For JSON, gather the errors again.
const char MSG[] = "Could not redirect any slaves to the new master.";
const char* const MSG = "Could not redirect any slaves to the new master.";
MXS_ERROR(MSG);
if (err_out)
{

2
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -977,7 +977,7 @@ bool handle_manual_switchover(const MODULECMD_ARG* args, json_t** error_out)
bool rval = false;
if (config_get_global_options()->passive)
{
const char MSG[] = "Switchover requested but not performed, as MaxScale is in passive mode.";
const char* const MSG = "Switchover requested but not performed, as MaxScale is in passive mode.";
PRINT_MXS_JSON_ERROR(error_out, MSG);
}
else