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

Improved behavior of debug cli API command 'fail accept'. It takes now _two_ arguments, Syntax:

Browse Source 
fail accept <errno> <repeat count>

Changed fail_next_accept from boolean to decreasing counter.
This commit is contained in:
vraatikka
2013-09-24 15:48:59 +03:00
parent e637ea3844
commit 09cc20b7be
4 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
server/modules/protocol/mysql_client.c
View File

@ -921,19 +921,23 @@ int gw_MySQLAccept(DCB *listener)
while (1) {
retry_accept:
// new connection from client
c_sock = accept(listener->fd,
(struct sockaddr *) &local,
&addrlen);
eno = errno;
#if defined(SS_DEBUG)
if (fail_next_accept) {
if (fail_next_accept > 0)
{
c_sock = -1;
eno = fail_accept_errno;
i = 10;
fail_next_accept = false;
fail_accept_errno = 0;
fail_next_accept -= 1;
} else {
fail_accept_errno = 0;
#endif /* SS_DEBUG */
// new connection from client
c_sock = accept(listener->fd,
(struct sockaddr *) &local,
&addrlen);
eno = errno;
errno = 0;
#if defined(SS_DEBUG)
}
#endif /* SS_DEBUG */
@ -946,10 +950,11 @@ int gw_MySQLAccept(DCB *listener)
/* We have processed all incoming connections. */
break;
}
else if (eno == ENFILE)
else if (eno == ENFILE || eno == EMFILE)
{
/**
* Exceeded system's max. number of files limit.
* Exceeded system's (ENFILE) or processes
* (EMFILE) max. number of files limit.
*/
skygw_log_write_flush(
LOGFILE_ERROR,
@ -966,26 +971,6 @@ int gw_MySQLAccept(DCB *listener)
rc = 1;
goto return_rc;
}
else if (eno == EMFILE)
{
/**
* Exceeded processes max. number of files limit.
*/
skygw_log_write_flush(
LOGFILE_ERROR,
"%lu [gw_MySQLAccept] Error %d, %s.",
pthread_self(),
eno,
strerror(eno));
i++;
usleep(100*i*i);
if (i<10) {
goto retry_accept;
}
rc = 1;
goto return_rc;
}
else
{
/**