CSTACKEX-18_2: plugin has to consider VM for snapshot in running and stopped state both.

Author: rajiv-jain-netapp

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java

@@ -198,9 +198,13 @@ boolean allVolumesOnOntapManagedStorage(long vmId) {
             return false;
         }
 
-        if (!VirtualMachine.State.Running.equals(userVm.getState())) {
-            logger.debug("ONTAP VM snapshot strategy requires a running VM, VM [{}] is in state [{}]",
-                    vmId, userVm.getState());
+        // ONTAP VM snapshots work for both Running and Stopped VMs.
+        // Running VMs may be frozen/thawed (if quiesce is requested).
+        // Stopped VMs don't need freeze/thaw - just take the FlexVol snapshot directly.
+        VirtualMachine.State vmState = userVm.getState();
+        if (!VirtualMachine.State.Running.equals(vmState) && !VirtualMachine.State.Stopped.equals(vmState)) {
+            logger.info("allVolumesOnOntapManagedStorage: ONTAP VM snapshot strategy requires VM to be Running or Stopped, VM [{}] is in state [{}], returning false",
+                    vmId, vmState);
             return false;
         }
 
@@ -289,7 +293,14 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
                 quiescevm = options.needQuiesceVM();
             }
 
-            if (quiescevm) {
+            // Check if VM is actually running - freeze/thaw only makes sense for running VMs
+            boolean vmIsRunning = VirtualMachine.State.Running.equals(userVm.getState());
+            boolean shouldFreezeThaw = quiescevm && vmIsRunning;
+
+            if (!vmIsRunning) {
+                logger.info("VM [{}] is in state [{}] (not Running). Skipping freeze/thaw - " +
+                        "FlexVolume snapshot will be taken directly.", userVm.getInstanceName(), userVm.getState());
+            } else if (quiescevm) {
                 logger.info("Quiesce option is enabled for ONTAP VM Snapshot of VM [{}]. " +
                         "VM file systems will be frozen/thawed for application-consistent snapshots.", userVm.getInstanceName());
             } else {
@@ -324,8 +335,8 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
             logger.info("VM [{}] has {} volumes across {} unique FlexVolume(s)",
                     userVm.getInstanceName(), volumeTOs.size(), flexVolGroups.size());
 
-            // ── Step 1: Freeze the VM (only if quiescing is requested) ──
-            if (quiescevm) {
+            // ── Step 1: Freeze the VM (only if quiescing is requested AND VM is running) ──
+            if (shouldFreezeThaw) {
                 FreezeThawVMCommand freezeCommand = new FreezeThawVMCommand(userVm.getInstanceName());
                 freezeCommand.setOption(FreezeThawVMCommand.FREEZE);
                 freezeAnswer = (FreezeThawVMAnswer) agentMgr.send(hostId, freezeCommand);
@@ -342,7 +353,8 @@ public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
 
                 logger.info("VM [{}] frozen successfully via QEMU guest agent", userVm.getInstanceName());
             } else {
-                logger.info("Skipping VM freeze for VM [{}] as quiesce is not requested", userVm.getInstanceName());
+                logger.info("Skipping VM freeze for VM [{}] (quiesce={}, vmIsRunning={})",
+                        userVm.getInstanceName(), quiescevm, vmIsRunning);
             }
 
             // ── Step 2: Create FlexVolume-level snapshots ──

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java

@@ -887,6 +887,7 @@ private UserVmVO setupTakeSnapshotCommon(VMSnapshotVO vmSnapshot) throws Excepti
         when(userVm.getGuestOSId()).thenReturn(GUEST_OS_ID);
         when(userVm.getInstanceName()).thenReturn(VM_INSTANCE_NAME);
         when(userVm.getUuid()).thenReturn(VM_UUID);
+        when(userVm.getState()).thenReturn(VirtualMachine.State.Running);
         when(userVmDao.findById(VM_ID)).thenReturn(userVm);
 
         GuestOSVO guestOS = mock(GuestOSVO.class);