From 4f88aa20b4e5ace523a2fb4b5f221d9e70e26d13 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 6 Nov 2013 19:06:27 +0100 Subject: do not complain for queue size on DA queues --- runtime/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/queue.c b/runtime/queue.c index 30269152..7ad2b849 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2106,7 +2106,8 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ break; } - if(pThis->iMaxQueueSize < 100) { + if(pThis->iMaxQueueSize < 100 + && (pThis->qType == QUEUETYPE_LINKEDLIST || pThis->qType == QUEUETYPE_FIXED_ARRAY)) { errmsg.LogError(0, RS_RET_OK_WARN, "Note: queue.size=\"%d\" is very " "low and can lead to unpredictable results. See also " "http://www.rsyslog.com/lower-bound-for-queue-sizes/", -- cgit v1.2.3 From 3f258be41684ff149e24adc3a3f80a47820614fa Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 7 Nov 2013 08:57:16 +0100 Subject: do not adjust batch size for disk queues --- runtime/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/queue.c b/runtime/queue.c index 7ad2b849..30516876 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2123,7 +2123,7 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ if(pThis->iLightDlyMrk == -1 || pThis->iLightDlyMrk > pThis->iMaxQueueSize) pThis->iLightDlyMrk = pThis->iMaxQueueSize - (pThis->iMaxQueueSize / 100) * 30; /* default 70% */ - if(pThis->iDeqBatchSize > pThis->iMaxQueueSize) + if(pThis->iMaxQueueSize > 0 && pThis->iDeqBatchSize > pThis->iMaxQueueSize) pThis->iDeqBatchSize = pThis->iMaxQueueSize; /* finalize some initializations that could not yet be done because it is -- cgit v1.2.3 From 00d2e47530f3b124f18036fe9d446fb8eb90e0d9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 7 Nov 2013 09:07:44 +0100 Subject: cosmetic: add test headers to some tests actually a bit more than cosmetic - makes it easier to see what failed --- tests/daqueue-persist.sh | 1 + tests/diskqueue.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/daqueue-persist.sh b/tests/daqueue-persist.sh index feb2a347..0781a7dc 100755 --- a/tests/daqueue-persist.sh +++ b/tests/daqueue-persist.sh @@ -2,6 +2,7 @@ # to carry out multiple tests with different queue modes # added 2009-05-27 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 +echo =============================================================================== echo \[daqueue-persist.sh\]: test data persisting at shutdown source $srcdir/daqueue-persist-drvr.sh LinkedList source $srcdir/daqueue-persist-drvr.sh FixedArray diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh index b871e9eb..853a836a 100755 --- a/tests/diskqueue.sh +++ b/tests/diskqueue.sh @@ -5,6 +5,7 @@ # added 2009-04-17 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 # uncomment for debugging support: +echo =============================================================================== echo \[diskqueue.sh\]: testing queue disk-only mode # uncomment for debugging support: #export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" -- cgit v1.2.3 From 6a27cd816c6972c553f1e3f38dd8f9ea3900e709 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 6 Nov 2013 19:06:27 +0100 Subject: do not complain for queue size on DA queues --- runtime/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/queue.c b/runtime/queue.c index 409424e7..925ef71e 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2084,7 +2084,8 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ break; } - if(pThis->iMaxQueueSize < 100) { + if(pThis->iMaxQueueSize < 100 + && (pThis->qType == QUEUETYPE_LINKEDLIST || pThis->qType == QUEUETYPE_FIXED_ARRAY)) { errmsg.LogError(0, RS_RET_OK_WARN, "Note: queue.size=\"%d\" is very " "low and can lead to unpredictable results. See also " "http://www.rsyslog.com/lower-bound-for-queue-sizes/", -- cgit v1.2.3 From 8752ce5a2e8fd50325364bb733619e7b8beb4876 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 7 Nov 2013 08:57:16 +0100 Subject: do not adjust batch size for disk queues --- runtime/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/queue.c b/runtime/queue.c index 925ef71e..073c6823 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -2101,7 +2101,7 @@ qqueueStart(qqueue_t *pThis) /* this is the ConstructionFinalizer */ if(pThis->iLightDlyMrk == -1 || pThis->iLightDlyMrk > pThis->iMaxQueueSize) pThis->iLightDlyMrk = pThis->iMaxQueueSize - (pThis->iMaxQueueSize / 100) * 30; /* default 70% */ - if(pThis->iDeqBatchSize > pThis->iMaxQueueSize) + if(pThis->iMaxQueueSize > 0 && pThis->iDeqBatchSize > pThis->iMaxQueueSize) pThis->iDeqBatchSize = pThis->iMaxQueueSize; /* finalize some initializations that could not yet be done because it is -- cgit v1.2.3