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

global config: new parameters for ruleset queue defaults

Browse Source 
specifically:

* default.ruleset.queue.timeoutshutdown
* default.ruleset.queue.timeoutactioncompletion
* default.ruleset.queue.timeoutenqueue
* default.ruleset.queue.timeoutworkerthreadshutdown

closes https://github.com/rsyslog/rsyslog/issues/3656
This commit is contained in:
Rainer Gerhards 2019-05-09 15:18:55 +02:00
parent 9d1578ddab
commit 359288d788
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
5 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/glbl.c
View File

@ -219,6 +219,10 @@ static struct cnfparamdescr cnfparamdescr[] = {
{ "default.action.queue.timeoutactioncompletion", eCmdHdlrInt, 0 },
{ "default.action.queue.timeoutenqueue", eCmdHdlrInt, 0 },
{ "default.action.queue.timeoutworkerthreadshutdown", eCmdHdlrInt, 0 },
{ "default.ruleset.queue.timeoutshutdown", eCmdHdlrInt, 0 },
{ "default.ruleset.queue.timeoutactioncompletion", eCmdHdlrInt, 0 },
{ "default.ruleset.queue.timeoutenqueue", eCmdHdlrInt, 0 },
{ "default.ruleset.queue.timeoutworkerthreadshutdown", eCmdHdlrInt, 0 },
{ "reverselookup.cache.ttl.default", eCmdHdlrNonNegInt, 0 },
{ "reverselookup.cache.ttl.enable", eCmdHdlrBinary, 0 },
{ "debug.files", eCmdHdlrArray, 0 },
@ -1478,6 +1482,14 @@ glblDoneLoadCnf(void)
actq_dflt_toEnq = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "default.action.queue.timeoutworkerthreadshutdown")) {
actq_dflt_toWrkShutdown = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "default.ruleset.queue.timeoutshutdown")) {
ruleset_dflt_toQShutdown = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "default.ruleset.queue.timeoutactioncompletion")) {
ruleset_dflt_toActShutdown = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "default.ruleset.queue.timeoutenqueue")) {
ruleset_dflt_toEnq = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "default.ruleset.queue.timeoutworkerthreadshutdown")) {
ruleset_dflt_toWrkShutdown = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "reverselookup.cache.ttl.default")) {
dnscacheDefaultTTL = cnfparamvals[i].val.d.n;
} else if(!strcmp(paramblk.descr[i].name, "reverselookup.cache.ttl.enable")) {

13
runtime/queue.c
View File

@ -90,6 +90,11 @@ int actq_dflt_toActShutdown = 1000; /* action shutdown (in phase 2) */
int actq_dflt_toEnq = 2000; /* timeout for queue enque */
int actq_dflt_toWrkShutdown = 60000; /* timeout for worker thread shutdown */
int ruleset_dflt_toQShutdown = 1500; /* queue shutdown */
int ruleset_dflt_toActShutdown = 1000; /* action shutdown (in phase 2) */
int ruleset_dflt_toEnq = 2000; /* timeout for queue enque */
int ruleset_dflt_toWrkShutdown = 60000; /* timeout for worker thread shutdown */
/* forward-definitions */
static rsRetVal doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, smsg_t *pMsg);
@ -1566,10 +1571,10 @@ qqueueSetDefaultsRulesetQueue(qqueue_t *pThis)
pThis->iMaxFileSize = 16*1024*1024;
pThis->iPersistUpdCnt = 0; /* persist queue info every n updates */
pThis->bSyncQueueFiles = 0;
pThis->toQShutdown = 1500; /* queue shutdown */
pThis->toActShutdown = 1000; /* action shutdown (in phase 2) */
pThis->toEnq = 2000; /* timeout for queue enque */
pThis->toWrkShutdown = 60000; /* timeout for worker thread shutdown */
pThis->toQShutdown = ruleset_dflt_toQShutdown;
pThis->toActShutdown = ruleset_dflt_toActShutdown;
pThis->toEnq = ruleset_dflt_toEnq;
pThis->toWrkShutdown = ruleset_dflt_toWrkShutdown;
pThis->iMinMsgsPerWrkr = -1; /* minimum messages per worker needed to start a new one */
pThis->bSaveOnShutdown = 1; /* save queue on shutdown (when DA enabled)? */
pThis->sizeOnDiskMax = 0; /* unlimited */

7
runtime/queue.h
View File

@ -1,6 +1,6 @@
/* Definition of the queue support module.
*
* Copyright 2008 Rainer Gerhards and Adiscon GmbH.
* Copyright 2008-2019 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of the rsyslog runtime library.
*
@ -242,6 +242,11 @@ extern int actq_dflt_toActShutdown;
extern int actq_dflt_toEnq;
extern int actq_dflt_toWrkShutdown;
extern int ruleset_dflt_toQShutdown;
extern int ruleset_dflt_toActShutdown;
extern int ruleset_dflt_toEnq;
extern int ruleset_dflt_toWrkShutdown;
#ifdef ENABLE_IMDIAG
extern unsigned int iOverallQueueSize;
#endif

2
tests/Makefile.am
View File

@ -153,6 +153,7 @@ TESTS += \
hostname-with-slash-dflt-slash-valid.sh \
stop-localvar.sh \
stop-msgvar.sh \
glbl-ruleset-queue-defaults.sh \
glbl-internalmsg_severity-info-shown.sh \
glbl-internalmsg_severity-debug-shown.sh \
glbl-internalmsg_severity-debug-not_shown.sh \
@ -1398,6 +1399,7 @@ EXTRA_DIST= \
operatingstate-empty.sh \
operatingstate-unclean.sh \
internal-errmsg-memleak-vg.sh \
glbl-ruleset-queue-defaults.sh \
glbl-internalmsg_severity-info-shown.sh \
glbl-internalmsg_severity-debug-shown.sh \
glbl-internalmsg_severity-debug-not_shown.sh \

21
tests/glbl-ruleset-queue-defaults.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
# check that global ruleset queue defaults can be specified. However,
# we do not tests that they actually work - that's quite hard to
# do reliably.
# addd 2019-05-09 by RGerhards, released under ASL 2.0
. ${srcdir:=.}/diag.sh init
generate_conf
add_conf '
global( default.ruleset.queue.timeoutshutdown="1000"
default.ruleset.queue.timeoutactioncompletion="1000"
default.ruleset.queue.timeoutenqueue="1000"
default.ruleset.queue.timeoutworkerthreadshutdown="1000"
)
action(type="omfile" file="'$RSYSLOG_OUT_LOG'")
'
cp -f $srcdir/testsuites/xlate.lkp_tbl $RSYSLOG_DYNNAME.xlate.lkp_tbl
startup
shutdown_when_empty
wait_shutdown
check_not_present 'parameter.*not known'
exit_test