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

MXS-1503: Remove redundant code

Browse Source 
Moved session command execution into the Backend class itself as the
session commands are defined as a related part of it. This allows all
connections to execute session commands if some are available.

Removed explicit SERVER_REF usage in the readwritesplit connection
creation code and replaced it with SRWBackend. This allows the removal of
the get_root_master_backend function which duplicated the functionality in
get_root_master.
This commit is contained in:
Markus Mäkelä
2018-03-27 21:39:59 +03:00
parent a1b5fcd4ff
commit be2186c8f1
6 changed files with 64 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/backend.cc
View File

@ -176,7 +176,7 @@ void Backend::set_state(backend_state state)
m_state |= state;
}
bool Backend::connect(MXS_SESSION* session)
bool Backend::connect(MXS_SESSION* session, SessionCommandList* sescmd)
{
bool rval = false;
@ -186,6 +186,16 @@ bool Backend::connect(MXS_SESSION* session)
m_state = IN_USE;
atomic_add(&m_backend->connections, 1);
rval = true;
if (sescmd && sescmd->size())
{
append_session_command(*sescmd);
if (!execute_session_command())
{
rval = false;
}
}
}
else
{