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

Move monitor runtime modification functions to MonitorManager

Browse Source 
Requires moving some general configuration checking functions to
config.cc.
This commit is contained in:
Esa Korhonen
2019-05-07 18:47:25 +03:00
parent a163fa8a2c
commit 5077ad62df
5 changed files with 235 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/internal/config.hh
View File

@ -250,3 +250,11 @@ constexpr int64_t MXS_UNKNOWN_ENUM_VALUE {-1};
* @return The enum value or MXS_UNKNOWN_ENUM_VALUE on unknown value
*/
int64_t config_enum_to_value(const std::string& key, const MXS_ENUM_VALUE* values);
bool validate_param(const MXS_MODULE_PARAM* basic, const MXS_MODULE_PARAM* module,
const std::string& key, const std::string& value, std::string* error_out);
bool param_is_known(const MXS_MODULE_PARAM* basic, const MXS_MODULE_PARAM* module, const char* key);
bool param_is_valid(const MXS_MODULE_PARAM* basic, const MXS_MODULE_PARAM* module,
const char* key, const char* value);

63
server/core/internal/monitormanager.hh
View File

@ -116,17 +116,47 @@ public:
static bool monitor_serialize(const mxs::Monitor* monitor);
/**
* Attempt to reconfigure a monitor
*
* If the configuration fails, the old parameters are restored.
* Attempt to reconfigure a monitor. If the reconfiguration fails, the old parameters are restored.
* Should be only called from the admin thread.
*
* @param monitor Monitor to reconfigure
* @param parameters New parameters to apply
*
* @return True if reconfiguration was successful
*/
static bool reconfigure_monitor(mxs::Monitor* monitor, const MXS_CONFIG_PARAMETER& parameters);
/**
* Change one parameter in the monitor during runtime. Should only be called from the admin thread.
*
* @param monitor Monitor to reconfigure
* @param key Setting to change
* @param value New value
* @param error_out Error output
* @return True if reconfiguration was successful
*/
static bool alter_monitor(mxs::Monitor* monitor, const std::string& key, const std::string& value,
std::string* error_out);
/**
* Add server to monitor during runtime. Should only be called from the admin thread.
*
* @param mon Target monitor
* @param server Server to add
* @param error_out Error output
* @return True on success
*/
static bool add_server_to_monitor(mxs::Monitor* mon, SERVER* server, std::string* error_out);
/**
* Remove a server from a monitor during runtime. Should only be called from the admin thread.
*
* @param mon Target monitor
* @param server Server to remove
* @param error_out Error output
* @return True on success
*/
static bool remove_server_from_monitor(mxs::Monitor* mon, SERVER* server, std::string* error_out);
/**
* @brief Convert monitor to JSON
*
@ -164,28 +194,3 @@ public:
*/
static void debug_wait_one_tick();
};
// RAII helper class for temprarily stopping monitors
class MonitorStop
{
public:
MonitorStop(mxs::Monitor* monitor)
: m_monitor(monitor->state() == MONITOR_STATE_RUNNING ? monitor : nullptr)
{
if (m_monitor)
{
MonitorManager::stop_monitor(m_monitor);
}
}
~MonitorStop()
{
if (m_monitor)
{
MonitorManager::start_monitor(m_monitor);
}
}
private:
mxs::Monitor* m_monitor;
};