diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:52:28 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:52:28 +0200 |
| commit | affa217cc2d22fa8037a50b8d40d3372694ff855 (patch) | |
| tree | cc330c7bca3053117bab0855dcf0e6fc0d2e4bec /tests/da-mainmsg-q.sh | |
| parent | 33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (diff) | |
| download | rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.gz rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.tar.xz rsyslog-affa217cc2d22fa8037a50b8d40d3372694ff855.zip | |
adapted testbench to new capabilities
... and now make check fails again, we have obviously found some new
bugs thanks to the additional cases
Diffstat (limited to 'tests/da-mainmsg-q.sh')
| -rwxr-xr-x | tests/da-mainmsg-q.sh | 66 |
1 files changed, 18 insertions, 48 deletions
diff --git a/tests/da-mainmsg-q.sh b/tests/da-mainmsg-q.sh index fde9e06e..1c947de2 100755 --- a/tests/da-mainmsg-q.sh +++ b/tests/da-mainmsg-q.sh @@ -8,55 +8,25 @@ # added 2009-04-22 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 echo "testing main message queue in DA mode (going to disk)" -rm -f work rsyslog.out.log -rm -rf test-spool -mkdir test-spool -rm -f work rsyslog.out.log rsyslog.out.log.save # work files -../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/da-mainmsg-q.conf & -sleep 1 -echo "rsyslogd started with pid " `cat rsyslog.pid` -# +source $srcdir/diag.sh init +source $srcdir/diag.sh startup da-mainmsg-q.conf + # part1: send first 50 messages (in memory, only) -# -./tcpflood 127.0.0.1 13514 1 50 -if [ "$?" -ne "0" ]; then - echo "error during tcpflood! see rsyslog.out.log.save for what was written" - cp rsyslog.out.log rsyslog.out.log.save -fi -ls -l test-spool -sleep 2 # we need this so that rsyslogd can receive all outstanding messages -# +#source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 50 +source $srcdir/diag.sh injectmsg 0 50 +source $srcdir/diag.sh wait-queueempty # let queue drain for this test case + # part 2: send bunch of messages. This should trigger DA mode -# -# 20000 messages should be enough - the disk test is slow enough ;) -./tcpflood 127.0.0.1 13514 2 20000 50 -if [ "$?" -ne "0" ]; then - echo "error during tcpflood! see rsyslog.out.log.save for what was written" - cp rsyslog.out.log rsyslog.out.log.save -fi -ls -l test-spool -sleep 8 # we need this so that rsyslogd can receive all outstanding messages -# +source $srcdir/diag.sh injectmsg 50 20000 +ls -l test-spool # for manual review + # send another handful -# -ls -l test-spool -./tcpflood 127.0.0.1 13514 1 50 20050 -if [ "$?" -ne "0" ]; then - echo "error during tcpflood! see rsyslog.out.log.save for what was written" - cp rsyslog.out.log rsyslog.out.log.save -fi -sleep 1 # we need this so that rsyslogd can receive all outstanding messages -# +source $srcdir/diag.sh injectmsg 20050 50 +#sleep 1 # we need this so that rsyslogd can receive all outstanding messages + # clean up and check test result -# -kill `cat rsyslog.pid` -rm -f work -sort < rsyslog.out.log > work -./chkseq -fwork -e20099 -if [ "$?" -ne "0" ]; then - # rm -f work rsyslog.out.log - echo "sequence error detected" - exit 1 -fi -rm -f work rsyslog.out.log -rm -rf test-spool +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +### currently, we get a stable abort if we use the former kill logic. With shutdown-when-empty, it hangs (but that still tells us there is a bug ;)) ### +#kill `cat rsyslog.pid` +source $srcdir/diag.sh seq-check 0 20099 +source $srcdir/diag.sh exit |