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

Disable parameters on main worker

Browse Source 
Disabling the parameter on the main worker prevents deadlocks if the
parameter is disabled at the same time a monitor diagnostic is executed.
This commit is contained in:
Markus Mäkelä
2018-08-02 09:50:18 +03:00
parent 0d934476b0
commit d22b02047f
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,12 +958,17 @@ void MariaDBMonitor::set_slave_heartbeat(MariaDBServer* server)
* *
* @param setting_name Setting to disable * @param setting_name Setting to disable
*/ */
void MariaDBMonitor::disable_setting(const char* setting) void MariaDBMonitor::disable_setting(const std::string& setting)
{ {
MXS_CONFIG_PARAMETER p = {}; Worker* worker = static_cast<Worker*>(mxs_rworker_get(MXS_RWORKER_MAIN));
p.name = const_cast<char*>(setting);
p.value = const_cast<char*>("false"); worker->post([=]()
monitor_add_parameters(m_monitor, &p); {
MXS_CONFIG_PARAMETER p = {};
p.name = const_cast<char*>(setting.c_str());
p.value = const_cast<char*>("false");
monitor_add_parameters(m_monitor, &p);
}, NULL, EXECUTE_AUTO);
} }
/** /**

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

@ -264,7 +264,7 @@ private:
int seconds_remaining); int seconds_remaining);
// Other methods // Other methods
void disable_setting(const char* setting); void disable_setting(const std::string& setting);
bool check_sql_files(); bool check_sql_files();
void enforce_read_only_on_slaves(); void enforce_read_only_on_slaves();
}; };