[16.0] Fix VLAN sub-interface dependencies#5498
Merged
Merged
Conversation
…AN creation Fix missing dependency between a VLAN subinterface and its parent adapter being configured for VLAN use. Previously, the VLAN item only depended on the adapter’s existence and MTU. In some cases, this allowed reconciliation to attempt VLAN creation before the parent interface (bridge) was fully created and configured for VLANs, causing the operation to fail. This change strengthens the dependency by requiring the adapter to be marked as a VLAN parent (UsedAsVlanParent) in addition to having a sufficient MTU. This guarantees correct ordering and prevents premature VLAN subinterface creation. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit e4bac49)
Optimize adapter reconciliation by avoiding unnecessary re-creation when VLANs are added or removed. Previously, changes to UsedAsVlanParent would always trigger adapter (i.e. bridge) re-creation. However, VLAN membership changes do not require re-creating the adapter as long as the bridge continues to be managed by the same microservice (NIM or zedrouter). This change refines the comparison logic to ignore direct changes to UsedAsVlanParent and instead only trigger re-creation when the adapter’s bridge ownership changes. This reduces churn during reconciliation while preserving correct behavior. Signed-off-by: Milan Lenco <[email protected]> (cherry picked from commit 618c417)
7 tasks
rene
approved these changes
Dec 17, 2025
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
3 participants
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.
Description
Backport of #5493
How to test and validate this PR
Test creating a deleting VLAN subinterfaces couple times.
Check that subinterfaces are created/deleted without any errors reported.
Changelog notes
Fix VLAN subinterface dependencies.
Checklist