Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vm): do not attach VirtualDisk if it already attached to another VirtualMachine #540

Merged
merged 2 commits into from
Nov 26, 2024
Merged

fix(vm): do not attach VirtualDisk if it already attached to another VirtualMachine #540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdc14da
fix
Nov 26, 2024
e474a78
Merge branch 'main' into fix/vm/not-attach-vd-if-it-already-attached-…
eofff Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions images/virtualization-artifact/pkg/controller/vm/internal/block_device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (h *BlockDeviceHandler) Handle(ctx context.Context, s state.VirtualMachineS
}

// Get BlockDeviceRefs from spec.
bdStatusRefs, conflictWarning := h.getBlockDeviceStatusRefsFromSpec(current.Spec.BlockDeviceRefs, bdState, vmbdaStatusRefs)
bdStatusRefs, conflictWarning := h.getBlockDeviceStatusRefsFromSpec(current, bdState, vmbdaStatusRefs)

// Fill BlockDeviceRefs every time without knowledge of previously kept BlockDeviceRefs.
changed.Status.BlockDeviceRefs = bdStatusRefs
Expand Down Expand Up @@ -174,7 +174,7 @@ func (h *BlockDeviceHandler) Name() string {
return nameBlockDeviceHandler
}

func (h *BlockDeviceHandler) getBlockDeviceStatusRefsFromSpec(bdSpecRefs []virtv2.BlockDeviceSpecRef, bdState BlockDevicesState, hotplugs []virtv2.BlockDeviceStatusRef) ([]virtv2.BlockDeviceStatusRef, string) {
func (h *BlockDeviceHandler) getBlockDeviceStatusRefsFromSpec(vm *virtv2.VirtualMachine, bdState BlockDevicesState, hotplugs []virtv2.BlockDeviceStatusRef) ([]virtv2.BlockDeviceStatusRef, string) {
hotplugsByName := make(map[string]struct{}, len(hotplugs))
for _, hotplug := range hotplugs {
hotplugsByName[hotplug.Name] = struct{}{}
Expand All @@ -183,10 +183,28 @@ func (h *BlockDeviceHandler) getBlockDeviceStatusRefsFromSpec(bdSpecRefs []virtv
var conflictedRefs []string
var refs []virtv2.BlockDeviceStatusRef

for _, bdSpecRef := range bdSpecRefs {
for _, bdSpecRef := range vm.Spec.BlockDeviceRefs {
// It is a precaution to not apply changes in spec.blockDeviceRefs if disk is already
// hotplugged using the VMBDA resource. The reverse check is done by the vmbda-controller.
// hotplugged using the VMBDA resource or plugged in Spec of another VM.
// spec check is done by VirtualDisk status
// the reverse check is done by the vmbda-controller.
if bdSpecRef.Kind == virtv2.DiskDevice {
vd, hasKey := bdState.VDByName[bdSpecRef.Name]

switch {
case !hasKey:
continue // can't attach not existing disk, waiting
case len(vd.Status.AttachedToVirtualMachines) == 0: // Not connected to another VM, don't skip
case len(vd.Status.AttachedToVirtualMachines) == 1:
if vd.Status.AttachedToVirtualMachines[0].Name != vm.Name {
conflictedRefs = append(conflictedRefs, bdSpecRef.Name)
continue
}
default:
conflictedRefs = append(conflictedRefs, bdSpecRef.Name)
continue
}

if _, conflict := hotplugsByName[bdSpecRef.Name]; conflict {
conflictedRefs = append(conflictedRefs, bdSpecRef.Name)
continue
Expand Down
Loading