diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 18:24:46 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-10 18:24:46 +0200 |
commit | 6141845f7514622f77d308b7aadb15891d3a627a (patch) | |
tree | 6b4c6380ff6653ca4a00bc76a235742512e8e124 | |
parent | 1dbdee7c774dd20e4653efc6871ddef5adce2785 (diff) | |
download | rsyslog-6141845f7514622f77d308b7aadb15891d3a627a.tar.gz rsyslog-6141845f7514622f77d308b7aadb15891d3a627a.tar.xz rsyslog-6141845f7514622f77d308b7aadb15891d3a627a.zip |
re-enabled queue disk fsync test
... actually, it was not broken, but just very slow. I have now
reduced the number of test messages so that make check will not be
held for an extended period of time.
-rw-r--r-- | runtime/ruleset.c | 1 | ||||
-rwxr-xr-x | tests/diskqueue-fsync.sh | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/runtime/ruleset.c b/runtime/ruleset.c index d135074f..a1454275 100644 --- a/runtime/ruleset.c +++ b/runtime/ruleset.c @@ -88,7 +88,6 @@ iterateRulesetAllActions(ruleset_t *pThis, rsRetVal (*pFunc)(void*, void*), void { iterateAllActions_t params; DEFiRet; - ISOBJ_TYPE_assert(pThis, ruleset); assert(pFunc != NULL); params.pFunc = pFunc; diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh index 8d2cb709..45fb864c 100755 --- a/tests/diskqueue-fsync.sh +++ b/tests/diskqueue-fsync.sh @@ -5,13 +5,11 @@ # added 2009-06-09 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 # uncomment for debugging support: -echo diskqueue-fsync test seems to have some issues -exit 1 echo testing queue disk-only mode, fsync case source $srcdir/diag.sh init source $srcdir/diag.sh startup diskqueue-fsync.conf -# 5000 messages should be enough - the disk fsync test is very slow! -source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 5000 +# 1000 messages should be enough - the disk fsync test is very slow! +source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 1000 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages -source $srcdir/diag.sh seq-check 0 4999 +source $srcdir/diag.sh seq-check 0 999 source $srcdir/diag.sh exit |