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

MXS-2546 Add DNS-resolving to topology detection

Browse Source 
When matching hostnames between MaxScale server configuration and the
SHOW SLAVE STATUS-output, use DNS-resolution if a simple string comparison
doesn't find an answer. Results of the resolution are saved to avoid
repeating the operation for the same address.
This commit is contained in:
Esa Korhonen
2019-06-06 11:20:34 +03:00
parent 5df1f2561c
commit d4b712ae84
6 changed files with 140 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,8 @@ void MariaDBMonitor::reset_server_info()
{
m_servers.push_back(new MariaDBServer(mon_server, m_servers.size(), m_settings.shared));
}
m_resolver = DNSResolver(); // Erases result cache.
}
void MariaDBMonitor::reset_node_index_info()
@ -106,10 +108,9 @@ void MariaDBMonitor::reset_node_index_info()
MariaDBServer* MariaDBMonitor::get_server(const EndPoint& search_ep)
{
// TODO: Do this with a map lookup
// TODO: Add DNS check here.
MariaDBServer* found = NULL;
for (MariaDBServer* server : m_servers)
// Phase 1: Direct string compare
for (auto server : m_servers)
{
EndPoint srv(server->m_server_base->server);
if (srv == search_ep)
@ -118,6 +119,28 @@ MariaDBServer* MariaDBMonitor::get_server(const EndPoint& search_ep)
break;
}
}
if (!found)
{
// Phase 2: Was not found with simple string compare. Try DNS resolving for endpoints with
// matching ports.
string target_addr = m_resolver.resolve_server(search_ep.host());
if (!target_addr.empty())
{
for (auto server : m_servers)
{
if (server->m_server_base->server->port == search_ep.port())
{
string server_addr = m_resolver.resolve_server(server->m_server_base->server->address);
if (server_addr == target_addr)
{
found = server;
break;
}
}
}
}
}
return found;
}