1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-20627 : Galera 4 not able to report proper wsrep_incoming_addresses

Browse Source 
wsrep_server_incoming_address function always returned value of the
wsrep_node_incoming_address even when actual incoming address
was resolved to inc_addr variable. Fixed by returning inc_addr
if it does contain incoming address.
This commit is contained in:
Jan Lindström 2022-05-30 11:11:48 +03:00
parent 99c8aed00d
commit c8fabbed42
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/wsrep_mysqld.cc
View File

@ -593,7 +593,7 @@ static std::string wsrep_server_incoming_address()
bool is_ipv6= false; bool is_ipv6= false;
unsigned int my_bind_ip= INADDR_ANY; // default if not set unsigned int my_bind_ip= INADDR_ANY; // default if not set
if (my_bind_addr_str && strlen(my_bind_addr_str) && if (my_bind_addr_str && strlen(my_bind_addr_str) &&
strcmp(my_bind_addr_str, "*") != 0) strcmp(my_bind_addr_str, "*") != 0)
{ {
my_bind_ip= wsrep_check_ip(my_bind_addr_str, &is_ipv6); my_bind_ip= wsrep_check_ip(my_bind_addr_str, &is_ipv6);
@ -658,9 +658,13 @@ static std::string wsrep_server_incoming_address()
snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), port); snprintf(inc_addr, inc_addr_max, fmt, addr.get_address(), port);
} }
done: done:
ret= wsrep_node_incoming_address; if (!strlen(inc_addr))
ret= wsrep_node_incoming_address;
else
ret= inc_addr;
WSREP_DEBUG("wsrep_incoming_address = %s", ret.c_str());
return ret; return ret;
} }