VMSnapshot is being stuck in expunging state (#80)

* AC-139 VMSnapshot is being stuck in expunging state

* Added global timeout value to take affect while executing script

Author: bharkarampudi

api/src/com/cloud/vm/snapshot/VMSnapshot.java

@@ -59,6 +59,7 @@ public String getDescription() {
             s_fsm.addTransition(Error, Event.ExpungeRequested, Expunging);
             s_fsm.addTransition(Expunging, Event.ExpungeRequested, Expunging);
             s_fsm.addTransition(Expunging, Event.OperationSucceeded, Removed);
+            s_fsm.addTransition(Expunging, Event.OperationFailed, Error);
         }
     }
 

engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java

@@ -242,6 +242,7 @@ public boolean deleteVMSnapshot(VMSnapshot vmSnapshot) {
             } else {
                 String errMsg = (answer == null) ? null : answer.getDetails();
                 s_logger.error("Delete vm snapshot " + vmSnapshot.getName() + " of vm " + userVm.getInstanceName() + " failed due to " + errMsg);
+                processAnswer(vmSnapshotVO, userVm, answer, hostId);
                 throw new CloudRuntimeException("Delete vm snapshot " + vmSnapshot.getName() + " of vm " + userVm.getInstanceName() + " failed due to " + errMsg);
             }
         } catch (OperationTimedoutException e) {
@@ -266,9 +267,13 @@ public void doInTransactionWithoutResult(TransactionStatus status) throws NoTran
                         finalizeRevert(vmSnapshot, answer.getVolumeTOs());
                         vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationSucceeded);
                     } else if (as instanceof DeleteVMSnapshotAnswer) {
-                        DeleteVMSnapshotAnswer answer = (DeleteVMSnapshotAnswer)as;
-                        finalizeDelete(vmSnapshot, answer.getVolumeTOs());
-                        vmSnapshotDao.remove(vmSnapshot.getId());
+                        if (as.getResult()) {
+                           DeleteVMSnapshotAnswer answer = (DeleteVMSnapshotAnswer)as;
+                           finalizeDelete(vmSnapshot, answer.getVolumeTOs());
+                           vmSnapshotDao.remove(vmSnapshot.getId());
+                        } else {
+                            vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed);
+                        }
                     }
                 }
             });

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteVMSnapshotCommandWrapper.java

@@ -136,13 +136,15 @@ private static String removeVolumeSnapshots(DeleteVMSnapshotCommand cmd, KVMStor
             if (ImageFormat.QCOW2.equals(volume.getFormat())) {
                 PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO) volume.getDataStore();
                 KVMPhysicalDisk disk = storagePoolMgr.getPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), volume.getPath());
-                String qemu_img_snapshot = Script.runSimpleBashScript("qemu-img snapshot -l " + disk.getPath() + " | tail -n +3 | awk -F ' ' '{print $2}' | grep ^" + cmd.getTarget().getSnapshotName() + "$");
+                int timeout = cmd.getWait();
+                String qemu_img_snapshot = Script.runSimpleBashScript("qemu-img snapshot -l " + disk.getPath() + " | tail -n +3 | awk -F ' ' '{print $2}' | grep ^" + cmd.getTarget().getSnapshotName() + "$", timeout);
                 if (qemu_img_snapshot == null) {
                     s_logger.info("Cannot find snapshot " + cmd.getTarget().getSnapshotName() + " in file " + disk.getPath());
-                }
-                int result = Script.runSimpleBashScriptForExitValue("qemu-img snapshot -d " + cmd.getTarget().getSnapshotName() + " " + disk.getPath());
-                if (result != 0) {
-                    ret.add("Delete VM Snapshot Failed due to can not remove snapshot from image file " + disk.getPath()  + " : " + result);
+                } else {
+                    int result = Script.runSimpleBashScriptForExitValue("qemu-img snapshot -d " + cmd.getTarget().getSnapshotName() + " " + disk.getPath(), timeout);
+                    if (result != 0) {
+                        ret.add("Delete VM Snapshot Failed due to can not remove snapshot from image file " + disk.getPath()  + " : " + result);
+                    }
                 }
             }
         }