Delete snapshot on failure

Delete the snapshot if there is a problem with the agent host

Author: slavkap

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java

@@ -607,16 +607,12 @@ public void copyAsync(DataObject srcData, DataObject dstData, AsyncCompletionCal
                             // if error during snapshot backup, cleanup the StorPool snapshot
                             if (answer != null && !answer.getResult()) {
                                 StorPoolUtil.spLog(String.format("Error while backing-up snapshot '%s' - cleaning up StorPool snapshot. Error: %s", snapName, answer.getDetails()));
-                                SpApiResponse resp = StorPoolUtil.snapshotDelete(snapName, conn);
-                                if (resp.getError() != null) {
-                                    final String err2 = String.format("Failed to cleanup StorPool snapshot '%s'. Error: %s.", snapName, resp.getError());
-                                    log.error(err2);
-                                    StorPoolUtil.spLog(err2);
-                                }
+                                deleteSnapshot(snapName, conn);
                             }
                         }
                     } catch (CloudRuntimeException e) {
                         err = e.getMessage();
+                        deleteSnapshot(snapName, conn);
                     }
                 }
             } else if (srcType == DataObjectType.VOLUME && dstType == DataObjectType.TEMPLATE) {
@@ -903,6 +899,16 @@ public void copyAsync(DataObject srcData, DataObject dstData, AsyncCompletionCal
         callback.complete(res);
     }
 
+    private static void deleteSnapshot(String snapName, SpConnectionDesc conn) {
+
+        SpApiResponse resp = StorPoolUtil.snapshotDelete(snapName, conn);
+        if (resp.getError() != null) {
+            final String err2 = String.format("Failed to cleanup StorPool snapshot '%s'. Error: %s.", snapName, resp.getError());
+            log.error(err2);
+            StorPoolUtil.spLog(err2);
+        }
+    }
+
     private Answer createVolumeSnapshot(StorageSubSystemCommand cmd, Long size, SpConnectionDesc conn,
                                         String volName, TemplateObjectTO dstTO) {
         Answer answer;