bug 10363 : cleanup vhd in secondary storage if backsnapshot fails

core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java

@@ -3051,6 +3051,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                         + secondaryStorageMountPath + " due to " + tmp[1];
             }
         }
+        String source = backupUuid + ".vhd";
+        killCopyProcess(conn, source);
         s_logger.warn(errMsg);
         return null;
 

scripts/vm/hypervisor/xenserver/vmopsSnapshot

@@ -180,7 +180,7 @@ def copyfile(fromFile, toFile, isISCSI):
         txt = util.pread2(cmd)
     except:
         try:
-	    os.system("rm -f " + toFile)
+            os.system("rm -f " + toFile)
         except:
 
         txt = ''