Fix storage cleanup corner case preventing VM deletion

Author: nvazquez

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java

@@ -1544,6 +1544,9 @@ public void destroyVolume(long volumeId) {
         // mark volume entry in volumes table as destroy state
         VolumeInfo vol = volFactory.getVolume(volumeId);
         vol.stateTransit(Volume.Event.DestroyRequested);
+        if (Volume.Type.ROOT == vol.getVolumeType()) {
+            updateDestroyedVolumeToDatadisk(volumeId);
+        }
         snapshotMgr.deletePoliciesForVolume(volumeId);
         annotationDao.removeByEntityType(AnnotationService.EntityType.VOLUME.name(), vol.getUuid());
 
@@ -1556,6 +1559,17 @@ public void destroyVolume(long volumeId) {
         }
     }
 
+    /**
+     * Prevent VM deletion if underlying issues cause the storage cleanup task to not work properly
+     */
+    private void updateDestroyedVolumeToDatadisk(long volumeId) {
+        VolumeVO volume = _volumeDao.findById(volumeId);
+        if (volume != null) {
+            volume.setVolumeType(Volume.Type.DATADISK);
+            _volumeDao.update(volumeId, volume);
+        }
+    }
+
     @Override
     public AsyncCallFuture<VolumeApiResult> createVolumeFromSnapshot(VolumeInfo volume, DataStore store, SnapshotInfo snapshot) {
         AsyncCallFuture<VolumeApiResult> future = new AsyncCallFuture<VolumeApiResult>();