Skip to content

[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202606 - #455

Merged
mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge
Sep 10, 2026
Merged

[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202606#455
mssonicbld merged 2 commits into
Azure:202606from
mssonicbld:sonicbld/202606-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* ce150de6 - (origin/202605) Tolerate ENOENT in vlanintf_validator ip neigh flush (#4809) (2026-09-09) [Divyarajsinh Jhala]<br>```

When GCU deletes a VLAN prefix from CONFIG_DB, intfmgrd asynchronously removes the address and its neighbors from the kernel. The subsequent ip neigh flush in vlanintf_validator can race with this removal and fail with ENOENT ("No such file or directory"), which is benign since the neighbors are already gone.

Treat this specific failure as success instead of logging ERR records that cause LogAnalyzer teardown failures in test suites. Other flush failures (device not found, etc.) still fail as before.

The change can be verified by reproducing the scenario by running generic_config_updater/test_vlan_interface.py::test_vlan_interface_tc1_suite sonic-mgmt test.

What I did
Given the scenario not being an ERR state, change the vlanintf_validator behavior to not log benign messages as ERRs

How I did it
By NOT logging benign ENOENT in vlanintf_validator as syslog ERR

How to verify it
The change can be verified by reproducing the scenario by running generic_config_updater/test_vlan_interface.py::test_vlan_interface_tc1_suite sonic-mgmt test.

Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)
closes #4836
@mssonicbld

Copy link
Copy Markdown
Collaborator Author

/azp run

@mssonicbld
mssonicbld merged commit 786f888 into Azure:202606 Sep 10, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants