Fix ssvm migrate storage network - #13379
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.20 #13379 +/- ##
=========================================
Coverage 16.26% 16.27%
- Complexity 13434 13436 +2
=========================================
Files 5667 5667
Lines 500731 500735 +4
Branches 60803 60806 +3
=========================================
+ Hits 81455 81474 +19
+ Misses 410172 410154 -18
- Partials 9104 9107 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull request overview
This PR targets KVM SSVM live migration failures when the storage network uses a dedicated VLAN by ensuring the destination host creates the storage VLAN bridge during migration/network preparation, even when the NIC’s broadcastType is not Storage but the broadcastUri scheme indicates storage.
Changes:
- Update
BridgeVifDriver#createStorageVnetBridgeIfNeededto detect storage networks viabroadcastUrischeme (storage://...) in addition tobroadcastType == Storage. - Avoid the previous early-return behavior that skipped bridge creation when
broadcastTypewasn’tStorage.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| if (nic.getBroadcastUri() == null) { | ||
| return storageBrName; | ||
| } | ||
|
|
||
| boolean isStorageBroadcast = Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) || | ||
| Networks.BroadcastDomainType.Storage.equals(Networks.BroadcastDomainType.getSchemeValue(nic.getBroadcastUri())); | ||
| if (!isStorageBroadcast) { | ||
| return storageBrName; | ||
| } |
|
@Pearl1594 |
| if (nic.getBroadcastUri() == null) { | ||
| return storageBrName; | ||
| } | ||
|
|
||
| boolean isStorageBroadcast = Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) || | ||
| Networks.BroadcastDomainType.Storage.equals(Networks.BroadcastDomainType.getSchemeValue(nic.getBroadcastUri())); | ||
| if (!isStorageBroadcast) { | ||
| return storageBrName; | ||
| } |
There was a problem hiding this comment.
There was a problem hiding this comment.
both branches
return storageBrName;This is a bit confusing. Can you unify them @Pearl1594 ?
ping @Pearl1594
DaanHoogland
changed the title
…etworks with dedicated vlan
7b680cf to
edbda62
Compare
|
ping |
Description
This PR fixes: #13378
Types of changes
Feature/Enhancement Scale or Bug Severity
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?