apache · nvazquez · Apr 8, 2022 · Oct 16, 2019 · Sep 11, 2020 · Sep 14, 2020
diff --git a/api/src/main/java/com/cloud/storage/Snapshot.java b/api/src/main/java/com/cloud/storage/Snapshot.java
@@ -26,7 +26,7 @@
 
 public interface Snapshot extends ControlledEntity, Identity, InternalIdentity, StateObject<Snapshot.State> {
     public enum Type {
-        MANUAL, RECURRING, TEMPLATE, HOURLY, DAILY, WEEKLY, MONTHLY;
+        MANUAL, RECURRING, TEMPLATE, HOURLY, DAILY, WEEKLY, MONTHLY, GROUP;
         private int max = 8;
 
         public void setMax(int max) {

diff --git a/core/src/main/java/com/cloud/agent/api/FreezeThawVMAnswer.java b/core/src/main/java/com/cloud/agent/api/FreezeThawVMAnswer.java
@@ -0,0 +1,39 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+public class FreezeThawVMAnswer extends Answer {
+
+    public FreezeThawVMAnswer() {
+        super();
+    }
+
+    public FreezeThawVMAnswer(FreezeThawVMCommand command, boolean success, String details) {
+        super(command, success, details);
+    }
+
+    public FreezeThawVMAnswer(FreezeThawVMCommand command, Exception e) {
+        super(command, e);
+    }
+
+    public FreezeThawVMAnswer(FreezeThawVMCommand command) {
+        super(command);
+    }
+}
diff --git a/core/src/main/java/com/cloud/agent/api/FreezeThawVMCommand.java b/core/src/main/java/com/cloud/agent/api/FreezeThawVMCommand.java
@@ -0,0 +1,56 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+public class FreezeThawVMCommand extends Command{
+
+    public static final String FREEZE = "frozen";
+    public static final String THAW = "thawed";
+    public static final String STATUS = "status";
+
+    private String vmName;
+    private String option;
+
+    public FreezeThawVMCommand(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public String getOption() {
+        return option;
+    }
+
+    public void setOption(String option) {
+        this.option = option;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+
+}
diff --git a/.../main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java b/.../main/java/org/apache/cloudstack/engine/subsystem/api/storage/StorageStrategyFactory.java
@@ -36,4 +36,12 @@ public interface StorageStrategyFactory {
 
     VMSnapshotStrategy getVmSnapshotStrategy(VMSnapshot vmSnapshot);
 
+    /**
+     * Used only for KVM hypervisors when allocating a VM snapshot
+     * @param vmId the ID of the virtual machine
+     * @param snapshotMemory for VM snapshots with memory
+     * @return VMSnapshotStrategy
+     */
+    VMSnapshotStrategy getVmSnapshotStrategy(Long vmId, Long rootPoolId, boolean snapshotMemory);
+
 }
diff --git a/.../src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java b/.../src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VMSnapshotStrategy.java
@@ -29,6 +29,14 @@ public interface VMSnapshotStrategy {
 
     StrategyPriority canHandle(VMSnapshot vmSnapshot);
 
+    /**
+     * Used only for KVM hypervisors when allocating a VM snapshot
+     * @param vmId the ID of the virtual machine
+     * @param snapshotMemory for VM snapshots with memory
+     * @return StrategyPriority
+     */
+    StrategyPriority canHandle(Long vmId, Long poolId, boolean snapshotMemory);
+
     /**
      * Delete vm snapshot only from database. Introduced as a Vmware optimization in which vm snapshots are deleted when
      * the vm gets deleted on hypervisor (no need to delete each vm snapshot before deleting vm, just mark them as deleted on DB)

diff --git a/...hot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/...hot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
@@ -53,6 +53,7 @@
 import com.cloud.storage.GuestOSHypervisorVO;
 import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.VolumeVO;
+import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.storage.dao.GuestOSHypervisorDao;
@@ -67,6 +68,7 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.vm.UserVmVO;
+import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.snapshot.VMSnapshot;
 import com.cloud.vm.snapshot.VMSnapshotVO;
@@ -332,7 +334,7 @@ private void updateVolumePath(List<VolumeObjectTO> volumeTOs) {
         }
     }
 
-    private void publishUsageEvent(String type, VMSnapshot vmSnapshot, UserVm userVm, VolumeObjectTO volumeTo) {
+    protected void publishUsageEvent(String type, VMSnapshot vmSnapshot, UserVm userVm, VolumeObjectTO volumeTo) {
         VolumeVO volume = volumeDao.findById(volumeTo.getId());
         Long diskOfferingId = volume.getDiskOfferingId();
         Long offeringId = null;
@@ -350,7 +352,7 @@ private void publishUsageEvent(String type, VMSnapshot vmSnapshot, UserVm userVm
                 volumeTo.getSize(), VMSnapshot.class.getName(), vmSnapshot.getUuid(), details);
     }
 
-    private void publishUsageEvent(String type, VMSnapshot vmSnapshot, UserVm userVm, Long vmSnapSize, Long virtualSize) {
+    protected void publishUsageEvent(String type, VMSnapshot vmSnapshot, UserVm userVm, Long vmSnapSize, Long virtualSize) {
         try {
             Map<String, String> details = new HashMap<>();
             if (vmSnapshot != null) {
@@ -449,4 +451,20 @@ public boolean deleteVMSnapshotFromDB(VMSnapshot vmSnapshot, boolean unmanage) {
         }
         return vmSnapshotDao.remove(vmSnapshot.getId());
     }
+
+    @Override
+    public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
+        UserVmVO vm = userVmDao.findById(vmId);
+        if (vm.getState() == State.Running && !snapshotMemory) {
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        List<VolumeVO> volumes = volumeDao.findByInstance(vmId);
+        for (VolumeVO volume : volumes) {
+            if (volume.getFormat() != ImageFormat.QCOW2) {
+                return StrategyPriority.CANT_HANDLE;
+            }
+        }
+        return StrategyPriority.DEFAULT;
+    }
 }
diff --git a/...hot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java b/...hot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java
@@ -37,6 +37,7 @@
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.VMSnapshotTO;
@@ -47,6 +48,7 @@
 import com.cloud.server.ManagementServerImpl;
 import com.cloud.storage.DiskOfferingVO;
 import com.cloud.storage.Storage;
+import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.VolumeDao;
@@ -105,6 +107,13 @@ public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
             throw new CloudRuntimeException("Failed to get the volumes for the vm snapshot: " + vmSnapshot.getUuid());
         }
 
+        if (!VMSnapshot.State.Allocated.equals(vmSnapshot.getState())) {
+            List<VMSnapshotDetailsVO> vmDetails = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "SnapshotGroupId" );
+            if (CollectionUtils.isEmpty(vmDetails)) {
+                return StrategyPriority.CANT_HANDLE;
+            }
+        }
+
         if (volumeTOs != null && !volumeTOs.isEmpty()) {
             for (VolumeObjectTO volumeTO: volumeTOs) {
                 Long poolId  = volumeTO.getPoolId();
@@ -118,6 +127,27 @@ public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
         return StrategyPriority.HIGHEST;
     }
 
+    @Override
+    public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
+        if (snapshotMemory) {
+            return StrategyPriority.CANT_HANDLE;
+        }
+        List<VolumeObjectTO> volumeTOs = vmSnapshotHelper.getVolumeTOList(vmId);
+        if (volumeTOs == null || volumeTOs.isEmpty()) {
+            return StrategyPriority.CANT_HANDLE;
+        }
+
+        for (VolumeObjectTO volumeTO : volumeTOs) {
+            Long poolId = volumeTO.getPoolId();
+            Storage.StoragePoolType poolType = vmSnapshotHelper.getStoragePoolType(poolId);
+            if (poolType != Storage.StoragePoolType.PowerFlex || volumeTO.getFormat() != ImageFormat.RAW || poolId != rootPoolId) {
+                return StrategyPriority.CANT_HANDLE;
+            }
+        }
+
+        return StrategyPriority.HIGHEST;
+    }
+
     @Override
     public VMSnapshot takeVMSnapshot(VMSnapshot vmSnapshot) {
         UserVm userVm = userVmDao.findById(vmSnapshot.getVmId());