fix(vm): unfreeze fs after snapshot

Signed-off-by: Daniil Antoshin <[email protected]>
deckhouse · Dec 9, 2024 · 295c19a · 295c19a
1 parent 64effd2
commit 295c19a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/service/snapshot_service.go b/images/virtualization-artifact/pkg/controller/service/snapshot_service.go
@@ -105,7 +105,9 @@ func (s *SnapshotService) CanUnfreeze(ctx context.Context, vdSnapshotName string
 
 		_, ok := vdByName[vdSnapshot.Spec.VirtualDiskName]
 		if ok {
-			return false, nil
+			if vdSnapshot.Status.Phase != virtv2.VirtualDiskSnapshotPhaseReady && vdSnapshot.Status.Phase != virtv2.VirtualDiskSnapshotPhaseFailed {
+				return false, nil
+			}
 		}
 	}
 
@@ -119,7 +121,9 @@ func (s *SnapshotService) CanUnfreeze(ctx context.Context, vdSnapshotName string
 
 	for _, vmSnapshot := range vmSnapshots.Items {
 		if vmSnapshot.Spec.VirtualMachineName == vm.Name {
-			return false, nil
+			if vmSnapshot.Status.Phase != virtv2.VirtualMachineSnapshotPhaseReady && vmSnapshot.Status.Phase != virtv2.VirtualMachineSnapshotPhaseFailed {
+				return false, nil
+			}
 		}
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle.go b/images/virtualization-artifact/pkg/controller/vmsnapshot/internal/life_cycle.go
@@ -72,6 +72,15 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vmSnapshot *virtv2.Virtual
 	switch vmSnapshot.Status.Phase {
 	case "":
 		vmSnapshot.Status.Phase = virtv2.VirtualMachineSnapshotPhasePending
+	case virtv2.VirtualMachineSnapshotPhaseFailed:
+		vmSnapshotCondition, _ := conditions.GetCondition(vmscondition.VirtualMachineSnapshotReadyType, vmSnapshot.Status.Conditions)
+
+		cb.
+			Status(metav1.ConditionFalse).
+			Reason(conditions.CommonReason(vmSnapshotCondition.Reason)).
+			Message(vmSnapshotCondition.Message)
+
+		return reconcile.Result{}, nil
 	case virtv2.VirtualMachineSnapshotPhaseReady:
 		// Ensure vd snapshots aren't lost.
 		var lostVDSnapshots []string