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

In case of error ftruncate is called with router->binlog_position

Browse Source 
In case of error router->binlog_position is used with truncate and
error message instead of router->last_written
This commit is contained in:
MassimilianoPinto
2016-11-30 10:05:00 +01:00
parent 38e4a5902f
commit f831295847
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,10 +352,10 @@ blr_write_binlog_record(ROUTER_INSTANCE *router, REP_HEADER *hdr, uint32_t size,
router->binlog_name, router->binlog_name,
strerror_r(errno, err_msg, sizeof(err_msg))); strerror_r(errno, err_msg, sizeof(err_msg)));
/* Remove any partial event that was written */ /* Remove any partial event that was written */
if (ftruncate(router->binlog_fd, router->last_written)) if (ftruncate(router->binlog_fd, router->binlog_position))
{ {
MXS_ERROR("%s: Failed to truncate binlog record at %lu of %s, %s. ", MXS_ERROR("%s: Failed to truncate binlog record at %lu of %s, %s. ",
router->service->name, router->last_written, router->service->name, router->binlog_position,
router->binlog_name, router->binlog_name,
strerror_r(errno, err_msg, sizeof(err_msg))); strerror_r(errno, err_msg, sizeof(err_msg)));
} }

4
server/modules/routing/binlog/blr_master.c
View File

@ -2607,10 +2607,10 @@ blr_write_data_into_binlog(ROUTER_INSTANCE *router, uint32_t data_len, uint8_t *
strerror_r(errno, err_msg, sizeof(err_msg))); strerror_r(errno, err_msg, sizeof(err_msg)));
/* Remove any partial event that was written */ /* Remove any partial event that was written */
if (ftruncate(router->binlog_fd, router->last_written)) if (ftruncate(router->binlog_fd, router->binlog_position))
{ {
MXS_ERROR("%s: Failed to truncate binlog record at %lu of %s, %s. ", MXS_ERROR("%s: Failed to truncate binlog record at %lu of %s, %s. ",
router->service->name, router->last_written, router->service->name, router->binlog_position,
router->binlog_name, router->binlog_name,
strerror_r(errno, err_msg, sizeof(err_msg))); strerror_r(errno, err_msg, sizeof(err_msg)));
} }