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

Fix cross-thread buffer usage

Browse Source 
If the initial handshake that is sent by the accepting thread is buffered,
the subsequent flushing of it is done by the owning thread. As
cross-thread buffer usage is not allowed, the initial handshake must be
sent by the owning thread.
This commit is contained in:
Markus Mäkelä
2018-11-09 09:51:47 +02:00
parent 514b5f7856
commit 0a9d24230a
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -34,7 +34,7 @@
#include <maxscale/protocol/mysql.h> #include <maxscale/protocol/mysql.h>
#include <maxscale/query_classifier.h> #include <maxscale/query_classifier.h>
#include <maxscale/router.h> #include <maxscale/router.h>
#include <maxscale/routingworker.h> #include <maxscale/routingworker.hh>
#include <maxscale/session.h> #include <maxscale/session.h>
#include <maxscale/ssl.h> #include <maxscale/ssl.h>
#include <maxscale/utils.h> #include <maxscale/utils.h>
@ -424,6 +424,7 @@ int MySQLSendHandshake(DCB* dcb)
// writing data in the Client buffer queue // writing data in the Client buffer queue
dcb->func.write(dcb, buf); dcb->func.write(dcb, buf);
protocol->protocol_auth_state = MXS_AUTH_STATE_MESSAGE_READ;
return sizeof(mysql_packet_header) + mysql_payload_size; return sizeof(mysql_packet_header) + mysql_payload_size;
} }
@ -1422,25 +1423,6 @@ int gw_MySQLAccept(DCB* listener)
static void gw_process_one_new_client(DCB* client_dcb) static void gw_process_one_new_client(DCB* client_dcb)
{ {
MySQLProtocol* protocol;
protocol = mysql_protocol_init(client_dcb, client_dcb->fd);
if (protocol == NULL)
{
/** delete client_dcb */
dcb_close(client_dcb);
MXS_ERROR("Failed to create protocol object for client connection.");
return;
}
client_dcb->protocol = protocol;
// send handshake to the client_dcb
MySQLSendHandshake(client_dcb);
// client protocol state change
protocol->protocol_auth_state = MXS_AUTH_STATE_MESSAGE_READ;
/** /**
* Set new descriptor to event set. At the same time, * Set new descriptor to event set. At the same time,
* change state to DCB_STATE_POLLING so that * change state to DCB_STATE_POLLING so that
@ -1466,6 +1448,15 @@ static void gw_process_one_new_client(DCB* client_dcb)
} }
else else
{ {
// Move the rest of the initialization process to the owning worker
mxs::RoutingWorker* worker = static_cast<mxs::RoutingWorker*>(client_dcb->poll.owner);
worker->execute([=](){
client_dcb->protocol = mysql_protocol_init(client_dcb, client_dcb->fd);
MXS_ABORT_IF_NULL(client_dcb->protocol);
MySQLSendHandshake(client_dcb);
}, mxs::RoutingWorker::EXECUTE_AUTO);
MXS_DEBUG("Added dcb %p for fd %d to epoll set.", MXS_DEBUG("Added dcb %p for fd %d to epoll set.",
client_dcb, client_dcb,
client_dcb->fd); client_dcb->fd);