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

MXS-1848 Parameters are not available at createInstance time

Browse Source 
The monitor parameters are not available when the monitor instance
is created so at least for the time being they are removed from
the API.
This commit is contained in:
Johan Wikman
2018-05-07 10:18:48 +03:00
parent 81654fb0e7
commit 5c1083c4aa
8 changed files with 66 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,22 +129,9 @@ bool MariaDBMonitor::set_replication_credentials(const MXS_CONFIG_PARAMETER* par
return rval;
}
MariaDBMonitor* MariaDBMonitor::create(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
MariaDBMonitor* MariaDBMonitor::create(MXS_MONITOR *monitor)
{
MariaDBMonitor *handle = new MariaDBMonitor(monitor);
if (check_monitor_permissions(monitor, "SHOW SLAVE STATUS"))
{
handle->m_checked = true;
}
else
{
handle->m_checked = false;
MXS_ERROR("Monitor cannot access servers. Starting the monitor will fail "
"unless problem was temporary or is addressed");
}
return handle;
return new MariaDBMonitor(monitor);
}
MariaDBMonitor* MariaDBMonitor::create_and_start(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
@ -171,6 +158,10 @@ MariaDBMonitor* MariaDBMonitor::create_and_start(MXS_MONITOR *monitor, const MXS
{
error = true;
}
else
{
handle->m_checked = true;
}
if (!error)
{
@ -928,10 +919,9 @@ bool MariaDBMonitor::check_sql_files()
return rval;
}
static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *monitor,
const MXS_CONFIG_PARAMETER* params)
static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *monitor)
{
return MariaDBMonitor::create(monitor, params);
return MariaDBMonitor::create(monitor);
}
static void destroyInstance(MXS_MONITOR_INSTANCE* monitor)

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

@ -66,10 +66,9 @@ public:
* Create the monitor instance and return the instance data.
*
* @param monitor General monitor data
* @param params Configuration parameters
* @return A pointer to MariaDBMonitor specific data.
*/
static MariaDBMonitor* create(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params);
static MariaDBMonitor* create(MXS_MONITOR *monitor);
/**
* Start the monitor instance and return the instance data, creating it if starting for the first time.