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

dcb's fd wasn't stored to client's protocol structure. Changed mysql_protocol_init to take fd as the Second argument.

Browse Source
This commit is contained in:
vraatikka
2013-09-14 23:01:26 +03:00
parent 4815856017
commit db7004e6ae
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/include/mysql_client_server_protocol.h
View File

@ -239,7 +239,7 @@ typedef enum
#endif #endif
void gw_mysql_close(MySQLProtocol **ptr); void gw_mysql_close(MySQLProtocol **ptr);
MySQLProtocol* mysql_protocol_init(DCB* dcb); MySQLProtocol* mysql_protocol_init(DCB* dcb, int fd);
MySQLProtocol *gw_mysql_init(MySQLProtocol *data); MySQLProtocol *gw_mysql_init(MySQLProtocol *data);
void gw_mysql_close(MySQLProtocol **ptr); void gw_mysql_close(MySQLProtocol **ptr);
int gw_receive_backend_auth(MySQLProtocol *conn); int gw_receive_backend_auth(MySQLProtocol *conn);

4
server/modules/protocol/mysql_backend.c
View File

@ -503,7 +503,7 @@ static int gw_create_backend_connection(
int rv = -1; int rv = -1;
int fd = -1; int fd = -1;
protocol = mysql_protocol_init(backend_dcb); protocol = mysql_protocol_init(backend_dcb, -1);
ss_dassert(protocol != NULL); ss_dassert(protocol != NULL);
if (protocol == NULL) { if (protocol == NULL) {
@ -517,8 +517,6 @@ static int gw_create_backend_connection(
/** if succeed, fd > 0, -1 otherwise */ /** if succeed, fd > 0, -1 otherwise */
rv = gw_do_connect_to_backend(server->name, server->port, &fd); rv = gw_do_connect_to_backend(server->name, server->port, &fd);
/** Assign fd with protocol */
protocol->fd = fd;
/** Assign protocol with backend_dcb */ /** Assign protocol with backend_dcb */
backend_dcb->protocol = protocol; backend_dcb->protocol = protocol;

2
server/modules/protocol/mysql_client.c
View File

@ -957,7 +957,7 @@ int gw_MySQLAccept(DCB *listener)
client_dcb->fd = c_sock; client_dcb->fd = c_sock;
client_dcb->remote = strdup(inet_ntoa(local.sin_addr)); client_dcb->remote = strdup(inet_ntoa(local.sin_addr));
protocol = mysql_protocol_init(client_dcb); protocol = mysql_protocol_init(client_dcb, c_sock);
ss_dassert(protocol != NULL); ss_dassert(protocol != NULL);
if (protocol == NULL) { if (protocol == NULL) {

7
server/modules/protocol/mysql_common.c
View File

@ -54,7 +54,8 @@ extern int gw_error_backend_event(DCB *dcb);
* *
*/ */
MySQLProtocol* mysql_protocol_init( MySQLProtocol* mysql_protocol_init(
DCB* dcb) DCB* dcb,
int fd)
{ {
MySQLProtocol* p; MySQLProtocol* p;
@ -78,6 +79,8 @@ MySQLProtocol* mysql_protocol_init(
p->protocol_chk_top = CHK_NUM_PROTOCOL; p->protocol_chk_top = CHK_NUM_PROTOCOL;
p->protocol_chk_tail = CHK_NUM_PROTOCOL; p->protocol_chk_tail = CHK_NUM_PROTOCOL;
#endif #endif
/** Assign fd with protocol */
p->fd = fd;
p->owner_dcb = dcb; p->owner_dcb = dcb;
CHK_PROTOCOL(p); CHK_PROTOCOL(p);
return_p: return_p:
@ -547,7 +550,7 @@ int gw_do_connect_to_backend(
skygw_log_write_flush( skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [gw_do_connect_to_backend] Establishing connection " "%lu [gw_do_connect_to_backend] Establishing connection "
"to back-end server failed. Socket creation failed due " "to backend server failed. Socket creation failed due "
"%d, %s.", "%d, %s.",
pthread_self(), pthread_self(),
eno, eno,