fix

Signed-off-by: Yaroslav Borbat <[email protected]>

Author: yaroslavborbat

images/virtualization-artifact/pkg/controller/vd/internal/migration.go

@@ -35,6 +35,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/common/object"
 	pvcspec "github.com/deckhouse/virtualization-controller/pkg/common/pvc"
 	commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
+	commonvmop "github.com/deckhouse/virtualization-controller/pkg/common/vmop"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	vdsupplements "github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/supplements"
@@ -155,7 +156,7 @@ func (h MigrationHandler) getAction(ctx context.Context, vd *virtv2.VirtualDisk,
 	}
 
 	if commonvd.IsMigrating(vd) {
-		return h.getActionIfMigrationInProgress(vd, vm, log), nil
+		return h.getActionIfMigrationInProgress(vd, vm, log)
 	}
 
 	vmMigrating, _ := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
@@ -171,6 +172,7 @@ func (h MigrationHandler) getAction(ctx context.Context, vd *virtv2.VirtualDisk,
 		}
 
 		if commonvd.StorageClassChanged(vd) {
+			log.Info("StorageClass Changed. VirtualDisk should be migrated.")
 			return migrate, nil
 		}
 
@@ -179,35 +181,49 @@ func (h MigrationHandler) getAction(ctx context.Context, vd *virtv2.VirtualDisk,
 	return none, nil
 }
 
-func (h MigrationHandler) getActionIfMigrationInProgress(vd *virtv2.VirtualDisk, vm *virtv2.VirtualMachine, log *slog.Logger) action {
+func (h MigrationHandler) getActionIfMigrationInProgress(vd *virtv2.VirtualDisk, vm *virtv2.VirtualMachine, log *slog.Logger) (action, error) {
 	// If VirtualMachine is not running, we can't migrate it. Should be reverted.
 	running, _ := conditions.GetCondition(vmcondition.TypeRunning, vm.Status.Conditions)
 	if running.Status != metav1.ConditionTrue {
 		log.Info("VirtualMachine is not running. Will be reverted.", slog.String("vm.name", vm.Name), slog.String("vm.namespace", vm.Namespace))
-		return revert
+		return revert, nil
 	}
 
 	if commonvd.IsMigrationsMatched(vm, vd) {
 		if vm.Status.MigrationState == nil {
 			log.Error("VirtualMachine migration state is empty. Please report a bug.", slog.String("vm.name", vm.Name), slog.String("vm.namespace", vm.Namespace))
-			return none
+			return none, nil
 		}
 		switch vm.Status.MigrationState.Result {
 		case virtv2.MigrationResultFailed:
-			return revert
+			return revert, nil
 		case virtv2.MigrationResultSucceeded:
-			return complete
+			return complete, nil
 		}
 	}
 
 	// If migration is in progress. VirtualMachine must have the migrating condition.
-	_, migratingFound := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
+	migrating, migratingFound := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
 	if !migratingFound {
 		log.Info("VirtualMachine is not migrating. Will be reverted.", slog.String("vm.name", vm.Name), slog.String("vm.namespace", vm.Namespace))
-		return revert
+		return revert, nil
+	}
+	if migrating.Reason == vmcondition.ReasonLastMigrationFinishedWithError.String() {
+		log.Info("Last VirtualMachine migration failed. Will be reverted.", slog.String("vm.name", vm.Name), slog.String("vm.namespace", vm.Namespace))
+		return revert, nil
+	}
+
+	// If not found InProgress migrating vmop, that means some wrong migration happened. Revert.
+	vmop, err := h.getInProgressMigratingVMOP(vm)
+	if err != nil {
+		return none, err
+	}
+	if vmop == nil {
+		log.Info("VirtualMachine is not migrating. Will be reverted.", slog.String("vm.name", vm.Name), slog.String("vm.namespace", vm.Namespace))
+		return revert, nil
 	}
 
-	return none
+	return none, nil
 }
 
 func (h MigrationHandler) getActionIfDisksNotMigratable(ctx context.Context, vd *virtv2.VirtualDisk, log *slog.Logger) (action, error) {
@@ -451,6 +467,24 @@ func (h MigrationHandler) handleComplete(ctx context.Context, vd *virtv2.Virtual
 	return nil
 }
 
+func (h MigrationHandler) getInProgressMigratingVMOP(vm *virtv2.VirtualMachine) (*virtv2.VirtualMachineOperation, error) {
+	vmops := &virtv2.VirtualMachineOperationList{}
+	err := h.client.List(context.Background(), vmops, client.InNamespace(vm.Namespace))
+	if err != nil {
+		return nil, err
+	}
+
+	for _, vmop := range vmops.Items {
+
+		if commonvmop.IsMigration(&vmop) && commonvmop.IsInProgressOrPending(&vmop) {
+			return &vmop, nil
+		}
+
+	}
+
+	return nil, nil
+}
+
 func (h MigrationHandler) createTargetPersistentVolumeClaim(ctx context.Context, vd *virtv2.VirtualDisk, sc *storev1.StorageClass, size resource.Quantity) (*corev1.PersistentVolumeClaim, error) {
 	pvcs, err := listPersistentVolumeClaims(ctx, vd, h.client)
 	if err != nil {

images/virtualization-artifact/pkg/controller/vmop/migration/internal/handler/lifecycle.go

@@ -331,7 +331,7 @@ func (h LifecycleHandler) canExecute(vmop *v1alpha2.VirtualMachineOperation, vm
 	}
 
 	if featuregates.Default().Enabled(featuregates.VolumeMigration) {
-		if migratable.Reason == vmcondition.ReasonDisksNotMigratable.String() {
+		if migratable.Reason == vmcondition.ReasonDisksNotMigratable.String() || isVolumeMigration {
 			migrating, _ := conditions.GetCondition(vmcondition.TypeMigrating, vm.Status.Conditions)
 			if migrating.Reason == vmcondition.ReasonReadyToMigrate.String() {
 				return true