mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-11 05:00:41 +01:00
Andre Lorbach
19ae11b869
- action.c: Add iSuspended flag to prevent infinite loops when transactions are suspended multiple times. Retry on first suspension and abort with RS_RET_SUSPENDED on subsequent suspensions. - tests/omprog-transactions-failed-messages.sh: Remove TODO comment and workaround code related to issue #2420 (deferred messages within transactions not being retried), as the underlying issue appears to be resolved. - tests/omprog-feedback-timeout.sh: Update expected output to reflect improved transaction handling behavior. The test now expects additional message processing cycles and proper timeout handling when the omprog action is suspended and restarted. - tests/omprog-feedback.sh: Make robust against timing variations from new action.c retry logic by replacing exact sequence matching with pattern-based validation to ensure cross-system compatibility. - tests/omhttp-retry-timeout.sh: Optimize test parameters for better reliability by reducing message count from 10000 to 5000, adding sequence check options, and reducing queue batch size from 2048 to 500 to prevent test timeouts and improve stability. - omhttp-batch-fail-with-400.sh test: resolve queue growth issue with HTTP 400 errors. The test was experiencing a queue growth issue where the queue size was increasing. This was caused by the omhttp module incorrectly treating HTTP 400 errors as retriable when they should be treated as permanent failures. FIX: Added httpretrycodes=["500", "502", "503", "504"] configuration. This explicitly specifies that only 5xx server errors should be retried. HTTP 400 errors are now properly treated as permanent failures. Some tests needed to be adapted, because they expected an "exactly once" paradigm, which the fixed bug seemed to provide in some cases (but not reliably). Actually, rsyslog guarantees "at least once", so duplicates can occur and are typical if transaction-like logic is used with non-transactional outputs. This addresses the transaction suspension edge case and cleans up temporary workaround code that is no longer needed. The test updates ensure that the improved transaction handling behavior is properly validated across different scenarios and that tests correctly reflect rsyslog's actual delivery semantics. closes https://github.com/rsyslog/rsyslog/issues/2420
60 lines
1.5 KiB
Bash
Executable File
60 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
# This file is part of the rsyslog project, released under ASL 2.0
|
|
|
|
# Starting actual testbench
|
|
. ${srcdir:=.}/diag.sh init
|
|
|
|
export NUMMESSAGES=10000
|
|
|
|
omhttp_start_server 0 --fail-with-400-after 1000
|
|
|
|
generate_conf
|
|
add_conf '
|
|
module(load="../contrib/omhttp/.libs/omhttp")
|
|
|
|
main_queue(queue.dequeueBatchSize="500")
|
|
|
|
template(name="tpl" type="string"
|
|
string="{\"msgnum\":\"%msg:F,58:2%\"}")
|
|
|
|
# Wrap message as a single batch for retry
|
|
template(name="tpl_retry" type="string" string="[%msg%]")
|
|
|
|
|
|
ruleset(name="ruleset_omhttp") {
|
|
action(
|
|
name="action_omhttp"
|
|
type="omhttp"
|
|
errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
|
|
template="tpl"
|
|
|
|
server="localhost"
|
|
serverport="'$omhttp_server_lstnport'"
|
|
restpath="my/endpoint"
|
|
batch="off"
|
|
|
|
retry="on"
|
|
|
|
# Configure retry codes - only retry 5xx server errors, not 4xx client errors
|
|
# This fixes the bug where HTTP 400 errors were incorrectly retried
|
|
httpretrycodes=["500", "502", "503", "504"]
|
|
|
|
# Auth
|
|
usehttps="off"
|
|
) & stop
|
|
}
|
|
|
|
if $msg contains "msgnum:" then
|
|
call ruleset_omhttp
|
|
'
|
|
startup
|
|
injectmsg 0 $NUMMESSAGES
|
|
shutdown_when_empty
|
|
wait_shutdown
|
|
omhttp_get_data $omhttp_server_lstnport my/endpoint
|
|
omhttp_stop_server
|
|
# Test expects only the first 1000 messages to be processed successfully
|
|
# Messages after 1000 get HTTP 400 errors and should NOT be retried
|
|
seq_check $SEQ_CHECK_OPTIONS 0 999
|
|
exit_test
|