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ä
2019-09-19 15:37:43 +03:00
parent 75e7c0da92 f46f873dc1
commit bd3107e7ca
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -1254,25 +1254,17 @@ bool RWSplitSession::handle_error_new_connection(DCB* backend_dcb, GWBUF* errmsg
route_stored_query();
}
bool succp = false;
bool ok = can_recover_servers() || can_continue_session();
if (!can_recover_servers())
if (!ok)
{
succp = can_continue_session();
if (!succp)
{
MXS_ERROR("Unable to continue session as all connections have failed, "
"last server to fail was '%s'.", backend->name());
}
}
else
{
// Try to replace failed connections
succp = open_connections();
MXS_ERROR("Unable to continue session as all connections have failed and "
"new connections cannot be created. Last server to fail was '%s'.",
backend->name());
MXS_INFO("Connection status: %s", get_verbose_status().c_str());
}
return succp;
return ok;
}
/**