add

Signed-off-by: yaroslavborbat <[email protected]>
deckhouse · Jul 17, 2024 · 904ea55 · 904ea55
1 parent 0d4d8bb
commit 904ea55
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/api/core/v1alpha2/events.go b/api/core/v1alpha2/events.go
@@ -53,6 +53,8 @@ const (
 	// ReasonUnknownHotPluggedVolume is event reason that volume was hot plugged to VirtualMachineInstance, but it is not a VirtualDisk.
 	ReasonUnknownHotPluggedVolume = "UnknownHotPluggedVolume"
 
+	// ReasonVDAlreadyInUse is event reason that VirtualDisk was not attached to VirtualMachine, because VirtualDisk attached to another VirtualMachine.
+	ReasonVDAlreadyInUse = "VirtualDiskAlreadyInUse"
 	// ReasonVMChangesApplied is event reason that changes applied from VM to underlying KVVM.
 	ReasonVMChangesApplied = "ChangesApplied"
 

diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
@@ -50,7 +50,7 @@ func GenerateCVMIDiskName(name string) string {
 	return CVMIDiskPrefix + name
 }
 
-func GerOriginalDiskName(prefixedName string) (string, bool) {
+func GetOriginalDiskName(prefixedName string) (string, bool) {
 	if strings.HasPrefix(prefixedName, VMDDiskPrefix) {
 		return strings.TrimPrefix(prefixedName, VMDDiskPrefix), true
 	}

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/attachee.go b/images/virtualization-artifact/pkg/controller/vd/internal/attachee.go
@@ -47,7 +47,7 @@ func (h AttacheeHandler) Handle(ctx context.Context, vd *virtv2.VirtualDisk) (re
 
 	for _, vm := range attachedVMs {
 		vd.Status.AttachedToVirtualMachines = append(vd.Status.AttachedToVirtualMachines, virtv2.AttachedVirtualMachine{
-			Name: vm.Name,
+			Name: vm.GetName(),
 		})
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/block_device.go b/images/virtualization-artifact/pkg/controller/vm/internal/block_device.go
@@ -130,7 +130,7 @@ func (h *BlockDeviceHandler) Handle(ctx context.Context, s state.VirtualMachineS
 				continue
 			}
 
-			vdName, ok := kvbuilder.GerOriginalDiskName(vs.Name)
+			vdName, ok := kvbuilder.GetOriginalDiskName(vs.Name)
 			if !ok {
 				h.logger.Warn("volume %s was hot plugged to VirtualMachineInstance %s, but it is not a VirtualDisk.", vdName, kvvmi.Name)
 				h.recorder.Eventf(changed, corev1.EventTypeNormal, virtv2.ReasonUnknownHotPluggedVolume, "Volume %s was hot plugged to VirtualMachineInstance %s, but it is not a VirtualDisk.", vdName, kvvmi.Name)
@@ -237,7 +237,19 @@ func (h *BlockDeviceHandler) countReadyBlockDevices(vm *virtv2.VirtualMachine, s
 			}
 		case virtv2.DiskDevice:
 			if vd, hasKey := s.VDByName[bd.Name]; hasKey {
-				if vd.Status.Phase == virtv2.DiskReady {
+				// we can attach vd to only one vm
+				attachReady := len(vd.Status.AttachedToVirtualMachines) == 0
+				for _, attached := range vd.Status.AttachedToVirtualMachines {
+					if attached.Name != vm.GetName() {
+						attachReady = false
+						msg := fmt.Sprintf("VirtualDisk was attached to another virtual machine %q", attached.Name)
+						h.logger.Warn(msg)
+						h.recorder.Event(vm, corev1.EventTypeWarning, virtv2.ReasonVDAlreadyInUse, msg)
+						break
+					}
+					attachReady = true
+				}
+				if vd.Status.Phase == virtv2.DiskReady && attachReady {
 					ready++
 				}
 			}

diff --git a/images/virtualization-artifact/pkg/controller/vmbda/internal/watcher/kvvmi_watcher.go b/images/virtualization-artifact/pkg/controller/vmbda/internal/watcher/kvvmi_watcher.go
@@ -125,7 +125,7 @@ func (eh KVVMIEventHandler) getHotPluggedVolumeStatuses(obj client.Object) map[s
 	for _, vs := range kvvmi.Status.VolumeStatus {
 		if vs.HotplugVolume != nil {
 			var name string
-			name, ok = kvbuilder.GerOriginalDiskName(vs.Name)
+			name, ok = kvbuilder.GetOriginalDiskName(vs.Name)
 			if !ok {
 				eh.logger.Warn("VolumeStatus is not a Disk", "vsName", vs.Name, "name", kvvmi.Name, "ns", kvvmi.Namespace)
 				continue