Synchronise yoga with upstream #92
Merged
Conversation
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
The privileged/agent/linux/ip_lib.py code was not always catching "entry does not exist" type errors when deleting entries, and most of the callers were not catching it either, which could lead to random failures. Add code in the IP route, rule and bridge fdb code to catch these errors and not raise on them, other exceptions will still be raised. Also fixed delete_neigh_entry() to not raise when the given namespace does not exist to make it like all the other calls in the file. Added or modified functional tests for above cases. Conflicts: neutron/privileged/agent/linux/ip_lib.py Change-Id: I083649ab1b9a9057ee276a7f3ba069eb667db870 Closes-bug: #2030804 (cherry picked from commit 16875b5)
[1] changed that value to 0 [1] https://review.opendev.org/c/openstack/neutron/+/861751 Related-Bug: #1993181 Change-Id: I7009e8a9fa8a61cc796d9592db0cf68e07e5884d (cherry picked from commit 407585f)
This was missed in the original fix[1] during 5th patch set. When ovn metadata port exists it's ip should be used as route irrespective of subnet is isolated or not. [1] https://review.opendev.org/c/openstack/neutron/+/886988 Related-Bug: #1982569 Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2213862 Change-Id: Icd84685c37fffa20e4fc9c5522f77bc63e2565f2 (cherry picked from commit 56172ed)
OVN metadata port from NetworkCache is being used and fixed_ips for it were not available at the time network was added into the cache. So let's re fetch it if it is available in the cache. Related-Bug: #1982569 Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2213862 Change-Id: Ie0ec43566fa2b3e13b4917493336ce1519c9b6bb (cherry picked from commit 0afa24d)
…etworks" into stable/yoga
These jobs do run on CentOS 9-Stream and broken with pyroute2-0.6.6 in stable/yoga similar to what seen in the related bug. Related-Bug: #2023764 Change-Id: I6ca1294b0f7ec1240c1f1d1f87114db4f223caef
github-actions
bot
added
automated
markgoddard
approved these changes
Dec 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR contains a snapshot of yoga from upstream.