Skip to content

Commit b735c27

Browse files
saiarcot895selldinesh
authored andcommitted
Update for dhcp and lag tests (#21499)
What is the motivation for this PR? Update the loganalyzer ignore list to fix a regex issue, and update the GCU test to ignore new error syslogs. The regex for ignoring systemd-networkd.socket failing to start included [1], which has a special meaning when interpreted as regex (match one character that has 1 in it; in other words, match a 1). Escape the brackets so that they get treated literally. sonic-net/sonic-utilities#4105 started logging errors when a GCU command fails with a non-zero exit status. However, there is one case of a (known) failure where dhcp_relay fails to restart because it hit the start limit. These error logs need to be ignored. Signed-off-by: Saikrishna Arcot <[email protected]> Signed-off-by: selldinesh <[email protected]>
1 parent 8af8205 commit b735c27

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

ansible/roles/test/files/tools/loganalyzer/loganalyzer_common_ignore.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ r, ".*ERR pmon.*Failed to unfreeze VDM stats in contextmanager for port.*"
424424
r, ".*ERR bgp\#bgpmon:\s+\*ERROR\*\s+Failed\s+with\s+rc:\d+\s+when\s+execute:\s+.*vtysh.*-c.*show\s+bgp\s+summary\s+json.*"
425425

426426
# Ignore systemd-networkd.socket not being able to be started. This is expected on non-DPU platforms.
427-
r, ".*ERR systemd[1]: Failed to listen on systemd-networkd.socket - Network Service Netlink Socket.*"
427+
r, ".*ERR systemd\[1\]: Failed to listen on systemd-networkd.socket - Network Service Netlink Socket.*"
428428

429429
# Ignore syncd error when switching global packet trimming mode
430430
r, ".*ERR .* SAI_API_SWITCH:brcm_sai_switch_pkt_trim_qos_tc_egr_entries_create:.* Egress qos map with idx .* entries are already present.*"

tests/generic_config_updater/conftest.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ def ignore_expected_loganalyzer_exceptions(duthosts, selected_dut_hostname, loga
7878
if loganalyzer:
7979
ignoreRegex = [
8080
".*ERR sonic_yang.*",
81-
".*ERR.*Failed to start dhcp_relay.service - dhcp_relay container.*", # Valid test_dhcp_relay for Bookworm
81+
82+
# Valid test_dhcp_relay for Bookworm and newer
83+
".*ERR.*Failed to start dhcp_relay.service - dhcp_relay container.*",
84+
".*ERR GenericConfigUpdater:.*Command failed: 'nsenter --target 1"
85+
".*systemctl restart dhcp_relay', returncode: 1",
86+
".*ERR GenericConfigUpdater:.*stderr: Job for dhcp_relay.service "
87+
"failed because start of the service was attempted too often.",
88+
8289
".*ERR.*Failed to start dhcp_relay container.*", # Valid test_dhcp_relay
8390
# Valid test_dhcp_relay test_syslog
8491
".*ERR GenericConfigUpdater: Service Validator: Service has been reset.*",

0 commit comments

Comments
 (0)