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

MXS-1865 Wrong permissions on backends no longer cause monitor start to fail

Browse Source 
The logic was weird, as the permission checking function assumes a disconnected
server as fine. The checking is now done when starting the main loop and lacking
grants print errors but does not stop the monitor.
This commit is contained in:
Esa Korhonen
2018-05-16 10:44:59 +03:00
parent b71710e066
commit 654b5f1958
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,19 +160,11 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
error = true; error = true;
} }
if (!error && !check_monitor_permissions(m_monitor_base, "SHOW SLAVE STATUS")) if (!error && (thread_start(&m_thread, monitorMain, this, 0) == NULL))
{
error = true;
}
if (!error)
{
if (thread_start(&m_thread, monitorMain, this, 0) == NULL)
{ {
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", m_monitor_base->name); MXS_ERROR("Failed to start monitor thread for monitor '%s'.", m_monitor_base->name);
error = true; error = true;
} }
}
if (error) if (error)
{ {
@ -339,6 +331,16 @@ void MariaDBMonitor::main_loop()
check_maxscale_schema_replication(); check_maxscale_schema_replication();
} }
/* Check monitor permissions. Failure won't cause the monitor to stop. Afterwards, close connections so
* that update_server() reconnects and checks server version. TODO: check permissions when checking
* server version. */
check_monitor_permissions(m_monitor_base, "SHOW SLAVE STATUS");
for (auto iter = m_servers.begin(); iter != m_servers.end(); iter++)
{
mysql_close((*iter)->m_server_base->con);
(*iter)->m_server_base->con = NULL;
}
while (m_keep_running) while (m_keep_running)
{ {
timespec loop_start; timespec loop_start;