syslog: accept standard rsyslogd rate-limit message in test_syslog_rate_limit#1247
Merged
bingwang-ms merged 1 commit intoJun 19, 2026
Conversation
…te_limit The test expected only SONiC's patched rsyslogd message: 'begin to drop messages due to rate-limiting' Standard rsyslogd (used on some platforms) emits a different message: 'N messages lost due to rate-limiting (M allowed within K seconds)' Both messages indicate that rate limiting is working correctly. Use regex alternation to accept either form, making the test work across different rsyslogd builds. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Bing Wang <bingwang@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of sonic-net/sonic-mgmt#25494 to 202512 branch.
Description of PR
Summary:
Fix
test_syslog_rate_limitfailure on platforms where rsyslogd emits a different rate-limit message.rsyslogd emits two different messages depending on version when rate-limiting triggers:
"begin to drop messages due to rate-limiting"— logged when drops start (transition 0→1)"N messages lost due to rate-limiting (M allowed within K seconds)"— logged as a summary when the rate-limit window endsBoth are standard rsyslogd messages from
ratelimit.c. The test only matched the first form, causing failures on rsyslogd versions that emit the summary form.This fix uses regex alternation to accept either form. The 202512 branch additionally had an overly specific pattern with a
rate-limit-test>:prefix that would not match the summary message form.Type of change