From 8612ac0854a2225910b30629b26a68ff5a02d392 Mon Sep 17 00:00:00 2001 From: yaroslavborbat Date: Wed, 15 Jan 2025 04:40:50 +0300 Subject: [PATCH] fix Signed-off-by: yaroslavborbat --- .../patches/031-hotplug-container-disk.patch | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/images/virt-artifact/patches/031-hotplug-container-disk.patch b/images/virt-artifact/patches/031-hotplug-container-disk.patch index 3f484d7a17..d9cf342773 100644 --- a/images/virt-artifact/patches/031-hotplug-container-disk.patch +++ b/images/virt-artifact/patches/031-hotplug-container-disk.patch @@ -1472,39 +1472,6 @@ index 3318c1c466..ce726edf12 100644 func Convert_v1_HostDisk_To_api_Disk(volumeName string, path string, disk *api.Disk) error { disk.Type = "file" disk.Driver.Type = "raw" -diff --git a/pkg/virt-launcher/virtwrap/manager.go b/pkg/virt-launcher/virtwrap/manager.go -index 2513ad62a8..664cd05eed 100644 ---- a/pkg/virt-launcher/virtwrap/manager.go -+++ b/pkg/virt-launcher/virtwrap/manager.go -@@ -1141,6 +1141,20 @@ func (l *LibvirtDomainManager) syncDiskHotplug( - ) error { - logger := log.Log.Object(vmi) - -+ lg := logger.With("TEST", "BRBT") -+ lg.Info("SYNC DISC") -+ -+ domainBytes, err := xml.Marshal(domain.Spec) -+ if err != nil { -+ return err -+ } -+ specBytes, err := xml.Marshal(spec) -+ if err != nil { -+ return err -+ } -+ lg.Infof("DOMAIN: %s", string(domainBytes)) -+ lg.Infof("SPEC: %s", string(specBytes)) -+ - // Look up all the disks to detach - for _, detachDisk := range getDetachedDisks(spec.Devices.Disks, domain.Spec.Devices.Disks) { - logger.V(1).Infof("Detaching disk %s, target %s", detachDisk.Alias.GetName(), detachDisk.Target.Device) -@@ -1158,6 +1172,7 @@ func (l *LibvirtDomainManager) syncDiskHotplug( - // Look up all the disks to attach - for _, attachDisk := range getAttachedDisks(spec.Devices.Disks, domain.Spec.Devices.Disks) { - allowAttach, err := checkIfDiskReadyToUse(getSourceFile(attachDisk)) -+ lg.Infof("ATTACHDISK: %s, allowAttach: %t", attachDisk.Alias.GetName(), allowAttach) - if err != nil { - return err - } diff --git a/pkg/virt-operator/resource/apply/BUILD.bazel b/pkg/virt-operator/resource/apply/BUILD.bazel index f6bd9bd4f1..fe6ab54f8c 100644 --- a/pkg/virt-operator/resource/apply/BUILD.bazel