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

Message logs changed for slave request errors

Browse Source 
Log messages changed for slave request errors
This commit is contained in:
MassimilianoPinto
2015-10-02 18:30:19 +02:00
parent 1e76de540f
commit 78252fcb78
2 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/modules/routing/binlog/blr.c
View File

@ -896,16 +896,29 @@ ROUTER_SLAVE *slave = (ROUTER_SLAVE *)router_session;
/* decrease server registered slaves counter */ /* decrease server registered slaves counter */
atomic_add(&router->stats.n_registered, -1); atomic_add(&router->stats.n_registered, -1);
LOGIF(LM, (skygw_log_write_flush( if (slave->state > 0) {
LOGFILE_MESSAGE, LOGIF(LM, (skygw_log_write_flush(
"%s: Slave %s, server id %d, disconnected after %ld seconds. " LOGFILE_MESSAGE,
"%d SQL commands, %d events sent (%lu bytes).", "%s: Slave %s, server id %d, disconnected after %ld seconds. "
router->service->name, slave->dcb->remote, "%d SQL commands, %d events sent (%lu bytes), binlog '%s', last position %lu",
slave->serverid, router->service->name, slave->dcb->remote,
time(0) - slave->connect_time, slave->serverid,
slave->stats.n_queries, time(0) - slave->connect_time,
slave->stats.n_events, slave->stats.n_queries,
slave->stats.n_bytes))); slave->stats.n_events,
slave->stats.n_bytes,
slave->binlogfile,
(unsigned long)slave->binlog_pos)));
} else {
LOGIF(LM, (skygw_log_write_flush(
LOGFILE_MESSAGE,
"%s: Slave %s, server id %d, disconnected after %ld seconds. "
"%d SQL commands",
router->service->name, slave->dcb->remote,
slave->serverid,
time(0) - slave->connect_time,
slave->stats.n_queries)));
}
/* /*
* Mark the slave as unregistered to prevent the forwarding * Mark the slave as unregistered to prevent the forwarding

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

@ -423,7 +423,7 @@ struct stat statb;
if (pos > filelen) if (pos > filelen)
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Attempting to read off the end of the binlog file, size %lu, event at %lu", filelen, pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Requested position %lu is beyond end of the binlog file '%s', size %lu", pos, file->binlogname, filelen);
return NULL; return NULL;
} }
@ -432,8 +432,8 @@ struct stat statb;
{ {
if (pos > router->binlog_position) if (pos > router->binlog_position)
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Attempting to read off the binlog file pos %lu, event at %lu", snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Requested position %lu is not available. Latest safe position %lu, end of binlog '%s' is %lu",
router->binlog_position, pos); pos, router->binlog_position, file->binlogname, router->current_pos);
} else { } else {
/* accessing last position is ok */ /* accessing last position is ok */
hdr->ok = 0x0; hdr->ok = 0x0;
@ -449,8 +449,8 @@ struct stat statb;
{ {
case 0: case 0:
LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG, LOGIF(LD, (skygw_log_write(LOGFILE_DEBUG,
"Reached end of binlog file at %d.", "Reached end of binlog file '%s' at %d.",
pos))); file->binlogname, pos)));
/* set ok indicator */ /* set ok indicator */
hdr->ok = 0x0; hdr->ok = 0x0;
@ -461,18 +461,18 @@ struct stat statb;
char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = ""; char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = "";
strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE); strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE);
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to read binlog file; (%s), event at %lu", snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to read binlog file '%s'; (%s), event at %lu",
err_msg, pos); file->binlogname, err_msg, pos);
if (errno == EBADF) if (errno == EBADF)
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bad file descriptor for binlog file, refcount %d, descriptor %d, event at %lu", snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bad file descriptor for binlog file '%s', refcount %d, descriptor %d, event at %lu",
file->refcnt, file->fd, pos); file->binlogname, file->refcnt, file->fd, pos);
break; break;
} }
default: default:
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data in log event header; " snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data in log event header; "
"expected %d bytes but read %d, position %lu", "expected %d bytes but read %d, position %lu, binlog file '%s'",
BINLOG_EVENT_HDR_LEN, n, pos); BINLOG_EVENT_HDR_LEN, n, pos, file->binlogname);
break; break;
} }
return NULL; return NULL;
@ -487,19 +487,19 @@ struct stat statb;
/* event pos & size checks */ /* event pos & size checks */
if (hdr->event_size == 0 || ((hdr->next_pos != (pos + hdr->event_size)) && (hdr->event_type != ROTATE_EVENT))) { if (hdr->event_size == 0 || ((hdr->next_pos != (pos + hdr->event_size)) && (hdr->event_type != ROTATE_EVENT))) {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Client requested master to start replication from invalid position %lu", pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Client requested master to start replication from invalid position %lu in binlog file '%s'", pos, file->binlogname);
return NULL; return NULL;
} }
/* event type checks */ /* event type checks */
if (router->mariadb10_compat) { if (router->mariadb10_compat) {
if (hdr->event_type > MAX_EVENT_TYPE_MARIADB10) { if (hdr->event_type > MAX_EVENT_TYPE_MARIADB10) {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Invalid MariaDB 10 event type 0x%x at %lu", hdr->event_type, pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Invalid MariaDB 10 event type 0x%x at %lu in binlog file '%s'", hdr->event_type, pos, file->binlogname);
return NULL; return NULL;
} }
} else { } else {
if (hdr->event_type > MAX_EVENT_TYPE) { if (hdr->event_type > MAX_EVENT_TYPE) {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Invalid event type 0x%x at %lu", hdr->event_type, pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Invalid event type 0x%x at %lu in binlog file '%s'", hdr->event_type, pos, file->binlogname);
return NULL; return NULL;
} }
} }
@ -531,19 +531,19 @@ struct stat statb;
char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = ""; char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = "";
strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE); strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE);
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to reread header in binlog file; (%s), event at %lu", snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to reread header in binlog file '%s'; (%s), event at %lu",
err_msg, pos); file->binlogname, err_msg, pos);
if (errno == EBADF) if (errno == EBADF)
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bad file descriptor rereading header for binlog file, " snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bad file descriptor rereading header for binlog file '%s', "
"refcount %d, descriptor %d, event at %lu", "refcount %d, descriptor %d, event at %lu",
file->refcnt, file->fd, pos); file->binlogname, file->refcnt, file->fd, pos);
break; break;
} }
default: default:
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data rereading log event header; " snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data rereading log event header; "
"expected %d bytes but read %d, position %lu", "expected %d bytes but read %d, position %lu in binlog file '%s'",
BINLOG_EVENT_HDR_LEN, n, pos); BINLOG_EVENT_HDR_LEN, n, pos, file->binlogname);
break; break;
} }
return NULL; return NULL;
@ -558,7 +558,8 @@ struct stat statb;
if (hdr->next_pos < pos && hdr->event_type != ROTATE_EVENT) if (hdr->next_pos < pos && hdr->event_type != ROTATE_EVENT)
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Next event position still incorrect after rereading, event at %lu", pos); snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Next event position still incorrect after rereading, "
"event at %lu in binlog file '%s'", pos, file->binlogname);
return NULL; return NULL;
} }
else else
@ -570,8 +571,8 @@ struct stat statb;
} }
if ((result = gwbuf_alloc(hdr->event_size)) == NULL) if ((result = gwbuf_alloc(hdr->event_size)) == NULL)
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to allocate memory for binlog entry, size %d, event at %lu", snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Failed to allocate memory for binlog entry, size %d, event at %lu in binlog file '%s'",
hdr->event_size, pos); hdr->event_size, pos, file->binlogname);
return NULL; return NULL;
} }
@ -587,21 +588,21 @@ struct stat statb;
char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = ""; char err_msg[BLRM_STRERROR_R_MSG_SIZE+1] = "";
strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE); strerror_r(errno, err_msg, BLRM_STRERROR_R_MSG_SIZE);
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Error reading the binlog event at %lu;" snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Error reading the binlog event at %lu in binlog file '%s';"
"(%s), expected %d bytes.", "(%s), expected %d bytes.",
pos, err_msg, hdr->event_size - BINLOG_EVENT_HDR_LEN); pos, file->binlogname, err_msg, hdr->event_size - BINLOG_EVENT_HDR_LEN);
} }
else else
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data in log event entry; " snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Bogus data in log event entry; "
"expected %d bytes but got %d, position %lu", "expected %d bytes but got %d, position %lu in binlog file '%s'",
hdr->event_size - BINLOG_EVENT_HDR_LEN, n, pos); hdr->event_size - BINLOG_EVENT_HDR_LEN, n, pos, file->binlogname);
if (filelen != 0 && filelen - pos < hdr->event_size) if (filelen != 0 && filelen - pos < hdr->event_size)
{ {
snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Binlog event is close to the end of the binlog file; " snprintf(errmsg, BINLOG_ERROR_MSG_LEN, "Binlog event is close to the end of the binlog file; "
"current file size is %lu, event at %lu", "current file size is %lu, event at %lu in binlog file '%s'",
filelen, pos); filelen, pos, file->binlogname);
} }
blr_log_header(LOGFILE_ERROR, "Possible malformed event header", hdbuf); blr_log_header(LOGFILE_ERROR, "Possible malformed event header", hdbuf);
} }