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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-02-24 14:10:19 +02:00
parent 19030bed35 0614a44a4d
commit 9ca2c7f777
5 changed files with 112 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
server/core/monitor.cc
View File

@ -1143,49 +1143,48 @@ Monitor::ping_or_connect_to_db(const MonitorServer::ConnectionSettings& sett, SE
}
/** Otherwise close the handle. */
mysql_close(pConn);
pConn = nullptr;
}
ConnectResult conn_result = ConnectResult::REFUSED;
if ((pConn = mysql_init(NULL)) != nullptr)
{
string uname = sett.username;
string passwd = sett.password;
const Server& srv = static_cast<const Server&>(server); // Clean this up later.
string server_specific_monuser = srv.monitor_user();
if (!server_specific_monuser.empty())
{
uname = server_specific_monuser;
passwd = srv.monitor_password();
}
char* dpwd = decrypt_password(passwd.c_str());
string uname = sett.username;
string passwd = sett.password;
const Server& srv = static_cast<const Server&>(server); // Clean this up later.
string server_specific_monuser = srv.monitor_user();
if (!server_specific_monuser.empty())
{
uname = server_specific_monuser;
passwd = srv.monitor_password();
}
char* dpwd = decrypt_password(passwd.c_str());
for (int i = 0; i < sett.connect_attempts; i++)
{
pConn = mysql_init(NULL);
mysql_optionsv(pConn, MYSQL_OPT_CONNECT_TIMEOUT, &sett.connect_timeout);
mysql_optionsv(pConn, MYSQL_OPT_READ_TIMEOUT, &sett.read_timeout);
mysql_optionsv(pConn, MYSQL_OPT_WRITE_TIMEOUT, &sett.write_timeout);
mysql_optionsv(pConn, MYSQL_PLUGIN_DIR, get_connector_plugindir());
time_t start = time(NULL);
time_t start = 0;
time_t end = 0;
for (int i = 0; i < sett.connect_attempts; i++)
if (mxs_mysql_real_connect(pConn, &server, uname.c_str(), dpwd))
{
start = time(NULL);
bool result = (mxs_mysql_real_connect(pConn, &server, uname.c_str(), dpwd) != NULL);
end = time(NULL);
if (result)
{
conn_result = ConnectResult::NEWCONN_OK;
break;
}
conn_result = ConnectResult::NEWCONN_OK;
break;
}
if (conn_result == ConnectResult::REFUSED && difftime(end, start) >= sett.connect_timeout)
else if (conn_result == ConnectResult::REFUSED
&& difftime(time(NULL), start) >= sett.connect_timeout)
{
conn_result = ConnectResult::TIMEOUT;
}
MXS_FREE(dpwd);
mysql_close(pConn);
pConn = nullptr;
}
MXS_FREE(dpwd);
*ppConn = pConn;
return conn_result;
}