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

Added fix blr_slave_register reply

Browse Source 
Added fix blr_slave_register reply
This commit is contained in:
MassimilianoPinto
2015-09-18 11:06:03 +02:00
parent d192cee0a1
commit 2a2582067a
1 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
server/modules/routing/binlog/blr_slave.c
View File

@ -1158,20 +1158,12 @@ int slen;
ptr += 2; ptr += 2;
slave->rank = extract_field(ptr, 32); slave->rank = extract_field(ptr, 32);
/*
* Now construct a response
*/
if ((resp = gwbuf_alloc(11)) == NULL)
return 0;
ptr = GWBUF_DATA(resp);
encode_value(ptr, 7, 24); // Payload length
ptr += 3;
*ptr++ = 1; // Sequence number
encode_value(ptr, 0, 24);
ptr += 3;
encode_value(ptr, slave->serverid, 32);
slave->state = BLRS_REGISTERED; slave->state = BLRS_REGISTERED;
return slave->dcb->func.write(slave->dcb, resp);
/*
* Send OK response
*/
return blr_slave_send_ok(router, slave);
} }
/** /**
@ -2094,31 +2086,31 @@ blr_slave_disconnect_all(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave)
return 1; return 1;
} }
/** /**
* Send a MySQL OK packet to the DCB * Send a MySQL OK packet to the slave backend
*
* @param router The binlog router instance
* @param slave The slave server to which we are sending the response
* *
* @param dcb The DCB to send the OK packet to
* @return result of a write call, non-zero if write was successful * @return result of a write call, non-zero if write was successful
*/ */
static int static int
blr_slave_send_ok(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave) blr_slave_send_ok(ROUTER_INSTANCE* router, ROUTER_SLAVE* slave)
{ {
GWBUF *pkt; GWBUF *pkt;
uint8_t *ptr; uint8_t *ptr;
uint8_t ok_packet[] = {7, 0, 0, // Payload length
1, // Seqno,
0, // OK,
0, 0, 2, 0, 0, 0};
if ((pkt = gwbuf_alloc(11)) == NULL) if ((pkt = gwbuf_alloc(sizeof(ok_packet))) == NULL)
return 0; return 0;
ptr = GWBUF_DATA(pkt);
*ptr++ = 7; // Payload length memcpy(GWBUF_DATA(pkt), ok_packet, sizeof(ok_packet));
*ptr++ = 0;
*ptr++ = 0; return slave->dcb->func.write(slave->dcb, pkt);
*ptr++ = 1; // Seqno
*ptr++ = 0; // ok
*ptr++ = 0;
*ptr++ = 0;
*ptr++ = 2;
*ptr++ = 0;
*ptr++ = 0;
*ptr++ = 0;
return slave->dcb->func.write(slave->dcb, pkt);
} }