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

Check if socket server is MaxScale service

Browse Source 
We need to handle the case that a MaxScale service is used as a
server over Unix domain sockets.
This commit is contained in:
Johan Wikman
2019-06-19 16:51:14 +03:00
parent 03a7850de4
commit 1fbb57f9b2
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,14 @@ SListener service_find_listener(Service* service,
*/
bool service_port_is_used(int port);
/**
* @brief Check if a MaxScale service listens on a Unix domain socket
*
* @param path The socket path to check
* @return True if a MaxScale service uses the socket
*/
bool service_socket_is_used(const std::string& socket_path);
/**
* @brief Check if the service has a listener with a matching name
*

15
server/core/server.cc
View File

@ -914,10 +914,17 @@ bool SERVER::is_mxs_service()
bool rval = false;
/** Do a coarse check for local server pointing to a MaxScale service */
if (strcmp(address, "127.0.0.1") == 0
|| strcmp(address, "::1") == 0
|| strcmp(address, "localhost") == 0
|| strcmp(address, "localhost.localdomain") == 0)
if (address[0] == '/')
{
if (service_socket_is_used(address))
{
rval = true;
}
}
else if (strcmp(address, "127.0.0.1") == 0
|| strcmp(address, "::1") == 0
|| strcmp(address, "localhost") == 0
|| strcmp(address, "localhost.localdomain") == 0)
{
if (service_port_is_used(port))
{

25
server/core/service.cc
View File

@ -1559,6 +1559,31 @@ bool service_port_is_used(int port)
return rval;
}
bool service_socket_is_used(const std::string& socket_path)
{
bool rval = false;
LockGuard guard(this_unit.lock);
for (Service* service : this_unit.services)
{
for (const auto& listener : listener_find_by_service(service))
{
if (listener->address() == socket_path)
{
rval = true;
break;
}
}
if (rval)
{
break;
}
}
return rval;
}
static const char* service_state_to_string(int state)
{
switch (state)