Skip to content

Fix issue with test_syslog_rate_limit #10867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StormLiangMS merged 1 commit into from
Dec 8, 2023
Merged

Fix issue with test_syslog_rate_limit #10867

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions tests/syslog/test_syslog_rate_limit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import contextlib
import logging
import os
import pytest
Expand Down Expand Up @@ -175,7 +176,9 @@ def verify_host_rate_limit(rand_selected_dut):
rand_selected_dut (object): DUT host object
"""
logger.info('Start syslog rate limit test for host')
rand_selected_dut.command('config syslog rate-limit-host -b {} -i {}'.format(RATE_LIMIT_BURST, RATE_LIMIT_INTERVAL))
with expect_host_rsyslog_restart(rand_selected_dut):
cmd = 'config syslog rate-limit-host -b {} -i {}'.format(RATE_LIMIT_BURST, RATE_LIMIT_INTERVAL)
rand_selected_dut.command(cmd)
rate_limit_data = rand_selected_dut.show_and_parse('show syslog rate-limit-host')
pytest_assert(rate_limit_data[0]['interval'] == str(RATE_LIMIT_INTERVAL),
'Expect rate limit interval {}, actual {}'.format(RATE_LIMIT_INTERVAL,
Expand All @@ -191,7 +194,8 @@ def verify_host_rate_limit(rand_selected_dut):
RATE_LIMIT_BURST + 1,
is_host=True)

rand_selected_dut.command('config syslog rate-limit-host -b {} -i {}'.format(0, 0))
with expect_host_rsyslog_restart(rand_selected_dut):
rand_selected_dut.command('config syslog rate-limit-host -b {} -i {}'.format(0, 0))
rate_limit_data = rand_selected_dut.show_and_parse('show syslog rate-limit-host')
pytest_assert(rate_limit_data[0]['interval'] == '0',
'Expect rate limit interval {}, actual {}'.format(0, rate_limit_data[0]['interval']))
Expand Down Expand Up @@ -244,6 +248,32 @@ def verify_rate_limit_with_log_generator(duthost, service_name, log_marker, expe
duthost.command(run_generator_cmd)


def get_host_rsyslogd_pid(duthost):
cmd = 'systemctl show --property MainPID --value rsyslog'
return int(duthost.command(cmd)['stdout'].strip())


@contextlib.contextmanager
def expect_host_rsyslog_restart(duthost, timeout=30):
current_pid = get_host_rsyslogd_pid(duthost)

yield

logger.info('Waiting for host rsyslogd to restart')
begin = time.time()
cmd = 'systemctl is-active rsyslog'
while time.time() < begin + timeout:
if get_host_rsyslogd_pid(duthost) != current_pid:
output = duthost.command(cmd, module_ignore_errors=True)['stdout'].strip()
if output == 'active':
logger.info('Host rsyslogd restarted')
return

time.sleep(1)

raise TimeoutError('Timeout waiting for host rsyslogd to restart')


def wait_rsyslogd_restart(duthost, service_name, old_pid):
logger.info('Waiting rsyslogd restart')
cmd = "docker exec -i {} bash -c 'supervisorctl status rsyslogd'".format(service_name)
Expand Down