Remove allocated snapshots / vm snapshots on start

Author: sureshanaparti

engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDao.java

@@ -38,4 +38,6 @@ public interface VMSnapshotDao extends GenericDao<VMSnapshotVO, Long>, StateDao<
     VMSnapshotVO findByName(Long vmId, String name);
 
     List<VMSnapshotVO> listByAccountId(Long accountId);
+
+    List<VMSnapshotVO> listAllByStatus(VMSnapshot.State... status);
 }

engine/schema/src/main/java/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java

@@ -20,7 +20,6 @@
 import java.util.Date;
 import java.util.List;
 
-
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -125,6 +124,13 @@ public List<VMSnapshotVO> listByAccountId(Long accountId) {
         return listBy(sc, null);
     }
 
+    @Override
+    public List<VMSnapshotVO> listAllByStatus(VMSnapshot.State... status) {
+        SearchCriteria<VMSnapshotVO> sc = SnapshotStatusSearch.create();
+        sc.setParameters("status", (Object[])status);
+        return listBy(sc, null);
+    }
+
     @Override
     public boolean updateState(State currentState, Event event, State nextState, VMSnapshot vo, Object data) {
 

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -1516,6 +1516,11 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
 
     @Override
     public boolean start() {
+        //remove snapshots in allocated state
+        List<SnapshotVO> allocatedSnapshots = _snapshotDao.listAllByStatus(Snapshot.State.Allocated);
+        for (SnapshotVO snapshot : allocatedSnapshots) {
+            _snapshotDao.remove(snapshot.getId());
+        }
         //destroy snapshots in destroying state
         List<SnapshotVO> snapshots = _snapshotDao.listAllByStatus(Snapshot.State.Destroying);
         for (SnapshotVO snapshotVO : snapshots) {

server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java

@@ -200,6 +200,11 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
 
     @Override
     public boolean start() {
+        //Remove VM Snapshots in allocated state
+        List<VMSnapshotVO> allocatedVMSnapshots = _vmSnapshotDao.listAllByStatus(VMSnapshot.State.Allocated);
+        for (VMSnapshotVO vmSnapshot : allocatedVMSnapshots) {
+            _vmSnapshotDao.remove(vmSnapshot.getId());
+        }
         return true;
     }