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

MXS-2273 Make schemarouter honour BEING_DRAINED bit

Browse Source 
The schema router now deals with the being drained bit the same way
it deals with the maintenance bit, that is, a server being drained will
simply be ignored.

TODO: This behaviour needs to be document.
TODO: It seems the schema router simply ignores the maintenance bit
      once a connection has been establisdhed.
This commit is contained in:
Johan Wikman
2019-01-25 16:58:02 +02:00
parent b564089afe
commit c2d3bdf7ef
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/schemarouter/schemarouterinstance.cc
View File

@ -127,7 +127,7 @@ bool connect_backend_servers(SSRBackendList& backends, MXS_SESSION* session)
{ {
SERVER_REF* b = (*it)->backend(); SERVER_REF* b = (*it)->backend();
if (b->server->is_usable()) if (b->server->is_connectable())
{ {
servers_found += 1; servers_found += 1;
@ -187,7 +187,7 @@ SchemaRouterSession* SchemaRouter::newSession(MXS_SESSION* pSession)
for (SERVER_REF* ref = m_service->dbref; ref; ref = ref->next) for (SERVER_REF* ref = m_service->dbref; ref; ref = ref->next)
{ {
if (ref->active) if (server_ref_is_active(ref))
{ {
backends.push_back(SSRBackend(new SRBackend(ref))); backends.push_back(SSRBackend(new SRBackend(ref)));
} }