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

Mariadb 10 event check in blr_read_events_all_events

Browse Source 
Mariadb 10 event check in blr_read_events_all_events
This commit is contained in:
MassimilianoPinto
2015-08-10 15:58:34 +02:00
parent d5c7a398d2
commit 81e4051f9e
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
server/modules/routing/binlog/blr_file.c
View File

@ -933,6 +933,7 @@ int var_block_len;
int statement_len; int statement_len;
int checksum_len=0; int checksum_len=0;
int found_chksum = 0; int found_chksum = 0;
int event_error = 0;
if (router->binlog_fd == -1) { if (router->binlog_fd == -1) {
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
@ -1039,25 +1040,41 @@ int found_chksum = 0;
hdr.next_pos = EXTRACT32(&hdbuf[13]); hdr.next_pos = EXTRACT32(&hdbuf[13]);
hdr.flags = EXTRACT16(&hdbuf[17]); hdr.flags = EXTRACT16(&hdbuf[17]);
/* TO DO */
/* Add MariaDB 10 check for MAX_EVENT_TYPE */
/* Check event type against MAX_EVENT_TYPE */ /* Check event type against MAX_EVENT_TYPE */
if (hdr.event_type > MAX_EVENT_TYPE)
{
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"Found an Invalid event type 0x%x. "
"Binlog file is %s, position %llu",
hdr.event_type,
router->binlog_name, pos)));
router->binlog_position = last_known_commit; if (router->mariadb10_compat) {
router->current_pos = pos; if (hdr.event_type > MAX_EVENT_TYPE_MARIADB10) {
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
"Invalid MariaDB 10 event type 0x%x. "
"Binlog file is %s, position %d",
hdr.event_type,
router->binlog_name, pos)));
event_error = 1;
}
} else {
if (hdr.event_type > MAX_EVENT_TYPE) {
LOGIF(LE, (skygw_log_write(LOGFILE_ERROR,
"Invalid event type 0x%x. "
"Binlog file is %s, position %d",
hdr.event_type,
router->binlog_name, pos)));
event_error = 1;
}
}
if (event_error) {
router->binlog_position = last_known_commit;
router->current_pos = pos;
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,
"warning : an error has been found. " "warning : an error has been found in %s. "
"Setting safe pos to %lu, current pos %lu", "Setting safe pos to %lu, current pos %lu",
router->binlog_position, router->current_pos))); router->binlog_name,
router->binlog_position,
router->current_pos)));
if (fix) { if (fix) {
ftruncate(router->binlog_fd, router->binlog_position); ftruncate(router->binlog_fd, router->binlog_position);
@ -1065,7 +1082,7 @@ int found_chksum = 0;
} }
return 1; return 1;
} }
if (hdr.event_size <= 0) if (hdr.event_size <= 0)
{ {