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

Use Backend::write for all writes in schemarouter

Browse Source 
The schemarouter should always use Backend::write for communication with
the backend servers. This keeps the backends in the correct state.

This fix solves some of the random test failures in the `sharding` test.
This commit is contained in:
Markus Mäkelä
2017-07-12 07:41:41 +03:00
parent 62fdda8534
commit c7a45466fb
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
maxscale-system-test/sharding.cpp
View File

@ -47,10 +47,7 @@ int main(int argc, char *argv[])
char user_str[256]; char user_str[256];
char pass_str[256]; char pass_str[256];
Test->repl->stop_slaves(); Test->repl->execute_query_all_nodes("STOP SLAVE");
Test->restart_maxscale();
Test->repl->connect(); Test->repl->connect();
for (i = 0; i < Test->repl->N; i++) //nodes for (i = 0; i < Test->repl->N; i++) //nodes
@ -68,7 +65,6 @@ int main(int argc, char *argv[])
} }
Test->stop_timeout(); Test->stop_timeout();
sleep(10);
for (i = 0; i < Test->repl->N; i++) //nodes for (i = 0; i < Test->repl->N; i++) //nodes
{ {
Test->set_timeout(30); Test->set_timeout(30);
@ -81,8 +77,9 @@ int main(int argc, char *argv[])
Test->repl->close_connections(); Test->repl->close_connections();
Test->stop_timeout(); Test->stop_timeout();
sleep(30); sleep(10);
MYSQL * conn;
MYSQL *conn;
for (i = 0; i < Test->repl->N; i++) for (i = 0; i < Test->repl->N; i++)
{ {
Test->set_timeout(30); Test->set_timeout(30);
@ -133,6 +130,7 @@ int main(int argc, char *argv[])
Test->check_log_err((char *) "Unable to parse query", false); Test->check_log_err((char *) "Unable to parse query", false);
Test->check_log_err((char *) "query string allocation failed", false); Test->check_log_err((char *) "query string allocation failed", false);
Test->repl->connect();
/** Cleanup */ /** Cleanup */
for (i = 0; i < Test->repl->N; i++) for (i = 0; i < Test->repl->N; i++)
{ {
@ -146,6 +144,9 @@ int main(int argc, char *argv[])
execute_query(Test->repl->nodes[i], "DROP DATABASE IF EXISTS shard_db%d", i); execute_query(Test->repl->nodes[i], "DROP DATABASE IF EXISTS shard_db%d", i);
} }
Test->repl->execute_query_all_nodes("START SLAVE");
sleep(1);
Test->repl->fix_replication();
int rval = Test->global_result; int rval = Test->global_result;
delete Test; delete Test;
return rval; return rval;

11
server/modules/routing/schemarouter/schemaroutersession.cc
View File

@ -473,10 +473,10 @@ void SchemaRouterSession::handle_mapping_reply(SSRBackend& bref, GWBUF** pPacket
rc = -1; rc = -1;
} }
} }
else if (m_queue.size() && rc != -1)
if (m_queue.size() && rc != -1)
{ {
ss_dassert(m_state == INIT_READY || m_state == INIT_USE_DB); ss_dassert(m_state == INIT_READY || m_state == INIT_USE_DB);
MXS_INFO("Routing stored query");
route_queued_query(); route_queued_query();
} }
} }
@ -943,11 +943,13 @@ bool SchemaRouterSession::handle_default_db()
data[3] = 0x0; data[3] = 0x0;
data[4] = 0x2; data[4] = 0x2;
memcpy(data + 5, m_connect_db.c_str(), qlen); memcpy(data + 5, m_connect_db.c_str(), qlen);
SSRBackend backend;
DCB* dcb = NULL; DCB* dcb = NULL;
if (get_shard_dcb(&dcb, target->unique_name)) if (get_shard_dcb(&dcb, target->unique_name) &&
(backend = get_bref_from_dcb(dcb)))
{ {
dcb->func.write(dcb, buffer); backend->write(buffer);
MXS_DEBUG("USE '%s' sent to %s for session %p", MXS_DEBUG("USE '%s' sent to %s for session %p",
m_connect_db.c_str(), m_connect_db.c_str(),
target->unique_name, target->unique_name,
@ -1020,6 +1022,7 @@ int SchemaRouterSession::inspect_mapping_states(SSRBackend& bref,
if (rc == SHOWDB_FULL_RESPONSE) if (rc == SHOWDB_FULL_RESPONSE)
{ {
(*it)->set_mapped(true); (*it)->set_mapped(true);
(*it)->ack_write();
MXS_DEBUG("Received SHOW DATABASES reply from %s for session %p", MXS_DEBUG("Received SHOW DATABASES reply from %s for session %p",
(*it)->backend()->server->unique_name, (*it)->backend()->server->unique_name,
m_client->session); m_client->session);