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

Merge remote-tracking branch 'origin/develop' into MXS-329

Browse Source 
Conflicts:
	server/core/session.c
This commit is contained in:
counterpoint
2015-09-10 13:07:27 +01:00
parent 296e306daa 9f01d0ec3f
commit cfeaf7d6e9
69 changed files with 3037 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server/core/dcb.c
View File

@ -562,6 +562,7 @@ dcb_process_victim_queue(DCB *listofdcb)
{
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"%lu [dcb_process_victim_queue] Error : Failed to close "
@ -570,7 +571,7 @@ dcb_process_victim_queue(DCB *listofdcb)
dcb->fd,
dcb,
eno,
strerror(eno))));
strerror_r(eno, errbuf, sizeof(errbuf)))));
}
else
{
@ -805,6 +806,7 @@ int dcb_read(
if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable))
{
char errbuf[STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
@ -815,7 +817,7 @@ int dcb_read(
STRDCBSTATE(dcb->state),
dcb->fd,
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
/* </editor-fold> */
return -1;
}
@ -855,6 +857,7 @@ int dcb_read(
* This is a fatal error which should cause shutdown.
* Todo shutdown if memory allocation fails.
*/
char errbuf[STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
@ -864,7 +867,7 @@ int dcb_read(
dcb,
dcb->fd,
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
/* </editor-fold> */
return -1;
}
@ -875,6 +878,7 @@ int dcb_read(
{
if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK)
{
char errbuf[STRERROR_BUFLEN];
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
@ -885,7 +889,7 @@ int dcb_read(
STRDCBSTATE(dcb->state),
dcb->fd,
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
/* </editor-fold> */
}
gwbuf_free(buffer);
@ -951,6 +955,7 @@ int dcb_read_SSL(
pending = SSL_pending(dcb->ssl);
if (rc == -1)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : ioctl FIONREAD for dcb %p in "
@ -959,7 +964,7 @@ int dcb_read_SSL(
STRDCBSTATE(dcb->state),
dcb->fd,
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
n = -1;
goto return_n;
}
@ -1012,6 +1017,7 @@ int dcb_read_SSL(
* This is a fatal error which should cause shutdown.
* Todo shutdown if memory allocation fails.
*/
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Failed to allocate read buffer "
@ -1019,7 +1025,7 @@ int dcb_read_SSL(
dcb,
dcb->fd,
errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
n = -1;
goto return_n;
@ -1054,6 +1060,7 @@ int dcb_read_SSL(
}
else
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Read failed, dcb %p in state "
@ -1062,7 +1069,7 @@ int dcb_read_SSL(
STRDCBSTATE(dcb->state),
dcb->fd,
ssl_errno,
strerror(errno))));
strerror_r(errno, errbuf, sizeof(errbuf)))));
if(ssl_errno == SSL_ERROR_SSL ||
ssl_errno == SSL_ERROR_SYSCALL)
@ -1337,6 +1344,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
{
if (eno == EPIPE)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_write] Write to dcb "
@ -1347,7 +1355,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
STRDCBSTATE(dcb->state),
dcb->fd,
eno,
strerror(eno))));
strerror_r(eno, errbuf, sizeof(errbuf)))));
}
}
@ -1357,6 +1365,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
eno != EAGAIN &&
eno != EWOULDBLOCK)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Write to dcb %p in "
@ -1366,7 +1375,7 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
STRDCBSTATE(dcb->state),
dcb->fd,
eno,
strerror(eno))));
strerror_r(eno, errbuf, sizeof(errbuf)))));
}
@ -1392,13 +1401,14 @@ dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
}
if (dolog)
{
char errbuf[STRERROR_BUFLEN];
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_write] Writing to %s socket failed due %d, %s.",
pthread_self(),
dcb_isclient(dcb) ? "client" : "backend server",
eno,
strerror(eno))));
strerror_r(eno, errbuf, sizeof(errbuf)))));
}
}
}
@ -1513,7 +1523,7 @@ static int
dcb_write_SSL_error_report (DCB *dcb, int ret)
{
int ssl_errno;
char errbuf[256];
char errbuf[STRERROR_BUFLEN];
ssl_errno = SSL_get_error(dcb->ssl,ret);
if (LOG_IS_ENABLED(LOGFILE_DEBUG))
@ -1573,9 +1583,7 @@ dcb_write_SSL_error_report (DCB *dcb, int ret)
{
if(ssl_errno == SSL_ERROR_SYSCALL)
{
strerror_r(errno,errbuf,255);
errbuf[255] = '\0';
skygw_log_write(LE,"%d:%s",errno,errbuf);
skygw_log_write(LE,"%d:%s", errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
do
{
@ -1646,6 +1654,7 @@ int above_water;
{
break;
}
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,
"Error : Write to dcb %p "
@ -1654,7 +1663,7 @@ int above_water;
STRDCBSTATE(dcb->state),
dcb->fd,
saved_errno,
strerror(saved_errno))));
strerror_r(saved_errno, errbuf, sizeof(errbuf)))));
break;
}
/*
@ -1750,7 +1759,10 @@ dcb_drain_writeq_SSL(DCB *dcb)
skygw_log_write(LE,"%s",errbuf);
}
if(errno != 0)
skygw_log_write(LE,"%d:%s",errno,strerror(errno));
{
char errbuf[STRERROR_BUFLEN];
skygw_log_write(LE,"%d:%s", errno, strerror_r(errno, errbuf, sizeof(errbuf)));
}
break;
case SSL_ERROR_ZERO_RETURN:
skygw_log_write(LE,"Socket is closed.");