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

Continue name resolution fixing, add unit test

Browse Source 
name_lookup() now returns all results given by getnameinfo(). When searching
for a server, finding one matching address in the lookup-results is enough for
a match.

Also, added a test for name_lookup(). The test is minimal on its own, as hardcoded
test cases are not generally valid.
This commit is contained in:
Esa Korhonen
2019-08-15 15:37:46 +03:00
parent 29ec15c8eb
commit e6bf020b9e
7 changed files with 142 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -1005,34 +1005,32 @@ bool MariaDBMonitor::is_candidate_valid(MariaDBServer* cand, RequireRunning req_
return is_valid;
};
string MariaDBMonitor::DNSResolver::resolve_server(const string& host)
MariaDBMonitor::DNSResolver::StringSet MariaDBMonitor::DNSResolver::resolve_server(const string& host)
{
auto now = mxb::Clock::now();
const auto MAX_AGE = mxb::Duration((double)5*60); // Refresh interval for cache entries.
auto recent_time = now - MAX_AGE;
DNSResolver::StringSet rval;
string rval;
auto iter = m_mapping.find(host);
if (iter == m_mapping.end() || iter->second.timestamp < recent_time)
{
// Map did not have a record, or it was too old. In either case, generate a new one.
string addr;
DNSResolver::StringSet addresses;
string error_msg;
bool dns_success = mxb::name_lookup(host, &addr, &error_msg);
bool dns_success = mxb::name_lookup(host, &addresses, &error_msg);
if (!dns_success)
{
MXB_ERROR("Could not resolve host '%s'. %s", host.c_str(), error_msg.c_str());
}
// If dns failed, addr will be empty. Add the element anyway to prevent repeated lookups.
MapElement newelem = {addr, now};
m_mapping[host] = newelem;
rval = addr;
// If dns failed, the array will be empty. Add/replace the element anyway to prevent repeated lookups.
m_mapping[host] = {addresses, now};
rval = std::move(addresses);
}
else
{
// Return recent value.
rval = iter->second.address;
rval = iter->second.addresses;
}
return rval;
}