rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 01:00:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

omtesting: fix for multiple worker threads was incomplete

Browse Source
This commit is contained in:
Rainer Gerhards 2013-12-05 16:26:18 +01:00
parent f66dbcd7fe
commit 576365752a
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/omtesting/omtesting.c
View File

@ -74,6 +74,9 @@ typedef struct _instanceData {
int iFailFrequency;
int iResumeAfter;
int iCurrRetries;
int bFailed; /* indicates if we are already in failed state - this is necessary
* to work properly together with multiple worker instances.
*/
pthread_mutex_t mut;
} instanceData;
@ -126,6 +129,7 @@ static rsRetVal doFailOnResume(instanceData *pData)
dbgprintf("fail retry curr %d, max %d\n", pData->iCurrRetries, pData->iResumeAfter);
if(++pData->iCurrRetries == pData->iResumeAfter) {
iRet = RS_RET_OK;
pData->bFailed = 0;
} else {
iRet = RS_RET_SUSPENDED;
}
@ -139,12 +143,18 @@ static rsRetVal doFail(instanceData *pData)
{
DEFiRet;
dbgprintf("fail curr %d, frquency %d\n", pData->iCurrCallNbr, pData->iFailFrequency);
if(pData->iCurrCallNbr++ % pData->iFailFrequency == 0) {
pData->iCurrRetries = 0;
iRet = RS_RET_SUSPENDED;
dbgprintf("fail curr %d, frequency %d, bFailed %d\n", pData->iCurrCallNbr,
pData->iFailFrequency, pData->bFailed);
if(pData->bFailed) {
ABORT_FINALIZE(RS_RET_SUSPENDED);
} else {
if(pData->iCurrCallNbr++ % pData->iFailFrequency == 0) {
pData->iCurrRetries = 0;
pData->bFailed = 1;
iRet = RS_RET_SUSPENDED;
}
}
finalize_it:
RETiRet;
}
@ -181,6 +191,7 @@ static rsRetVal doRandFail(void)
BEGINtryResume
CODESTARTtryResume
dbgprintf("omtesting tryResume() called\n");
pthread_mutex_lock(&pWrkrData->pData->mut);
switch(pWrkrData->pData->mode) {
case MD_SLEEP:
break;
@ -193,6 +204,7 @@ CODESTARTtryResume
case MD_ALWAYS_SUSPEND:
iRet = RS_RET_SUSPENDED;
}
pthread_mutex_unlock(&pWrkrData->pData->mut);
dbgprintf("omtesting tryResume() returns iRet %d\n", iRet);
ENDtryResume

4
tests/diag.sh
View File

@ -10,8 +10,8 @@
#valgrind="valgrind --tool=helgrind --log-fd=1"
#valgrind="valgrind --tool=exp-ptrcheck --log-fd=1"
#set -o xtrace
#export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
#export RSYSLOG_DEBUGLOG="log"
export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
export RSYSLOG_DEBUGLOG="log"
case $1 in
'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
cp $srcdir/testsuites/diag-common.conf diag-common.conf

1
tests/testsuites/execonlywhenprevsuspended.conf
View File

@ -1,5 +1,6 @@
# See main .sh file for info
# rgerhards, 2010-06-23
main_queue(queue.workerthreads="1")
$IncludeConfig diag-common.conf
# omtesting provides the ability to cause "SUSPENDED" action state