diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:01:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-14 11:01:21 +0200 |
| commit | c5408da3d8f17691fb91282d031757ed041fec55 (patch) | |
| tree | 4f932e801fac21ddc03616168106ac65411c340b /tests | |
| parent | 4d70c9b3e5e480d6dfa1c94506270f1f78e8ef32 (diff) | |
| download | rsyslog-c5408da3d8f17691fb91282d031757ed041fec55.tar.gz rsyslog-c5408da3d8f17691fb91282d031757ed041fec55.tar.xz rsyslog-c5408da3d8f17691fb91282d031757ed041fec55.zip | |
new queue engine - initial commit (probably not 100% working!)
simplified and thus speeded up the queue engine, also fixed some
potential race conditions (in very unusual shutdown conditions)
along the way. The threading model has seriously changes, so there may
be some regressions.
NOTE: the code passed basic tests, but there is still more work
and testing to be done. This commit should be treated with care.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/arrayqueue.sh | 4 | ||||
| -rwxr-xr-x | tests/daqueue-persist-drvr.sh | 9 | ||||
| -rwxr-xr-x | tests/inputname.sh | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7f12f633..c31e9eaa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,7 @@ TESTS = $(TESTRUNS) cfg.sh \ da-mainmsg-q.sh \ validation-run.sh \ imtcp-multiport.sh \ - #daqueue-persist.sh \ + daqueue-persist.sh \ diskqueue.sh \ diskqueue-fsync.sh \ manytcp.sh \ diff --git a/tests/arrayqueue.sh b/tests/arrayqueue.sh index 58fd24ae..baf303f3 100755 --- a/tests/arrayqueue.sh +++ b/tests/arrayqueue.sh @@ -1,7 +1,7 @@ # Test for fixedArray queue mode # added 2009-05-20 by rgerhards # This file is part of the rsyslog project, released under GPLv3 -echo testing queue fixedArray queue mode +echo \[arrayqueue.sh\]: testing queue fixedArray queue mode source $srcdir/diag.sh init source $srcdir/diag.sh startup arrayqueue.conf @@ -13,5 +13,5 @@ kill `cat rsyslog.pid` # now wait until rsyslog.pid is gone (and the process finished) source $srcdir/diag.sh wait-shutdown -source $srcdir/diag.sh seq-check 0 39999 +source $srcdir/diag.sh seq-check 39999 source $srcdir/diag.sh exit diff --git a/tests/daqueue-persist-drvr.sh b/tests/daqueue-persist-drvr.sh index 69db73ba..f5937541 100755 --- a/tests/daqueue-persist-drvr.sh +++ b/tests/daqueue-persist-drvr.sh @@ -12,6 +12,9 @@ source $srcdir/diag.sh init echo \$MainMsgQueueType $1 > work-queuemode.conf echo "*.* :omtesting:sleep 0 1000" > work-delay.conf +#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +#export RSYSLOG_DEBUGLOG="log0" + # inject 10000 msgs, so that DO hit the high watermark source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh injectmsg 0 10000 @@ -23,8 +26,8 @@ echo "Enter phase 2, rsyslogd restart" #exit -export RSYSLOG_DEBUG="debug nostdout printmutexaction" -export RSYSLOG_DEBUGLOG="log" +#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +#export RSYSLOG_DEBUGLOG="log" #valgrind="valgrind --tool=helgrind --log-fd=1" # restart engine and have rest processed @@ -33,5 +36,5 @@ echo "#" > work-delay.conf source $srcdir/diag.sh startup queue-persist.conf source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages $srcdir/diag.sh wait-shutdown -source $srcdir/diag.sh seq-check 0 4999 +source $srcdir/diag.sh seq-check 0 99999 source $srcdir/diag.sh exit diff --git a/tests/inputname.sh b/tests/inputname.sh index e1a58517..71f11c1e 100755 --- a/tests/inputname.sh +++ b/tests/inputname.sh @@ -1,4 +1,4 @@ -echo testing $InputTCPServerInputName directive +echo \[inputname.sh\]: testing $InputTCPServerInputName directive $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason echo port 12514 |