From bf75ccbb155731459473bb5fe4859b6a0c429491 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 10 Jan 2012 15:53:36 -0800
Subject: [PATCH] bug 10363 : cleanup vhd in secondary storage if backsnapshot
 fails

---
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java   | 2 ++
 scripts/vm/hypervisor/xenserver/vmopsSnapshot                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 63d91b93d9c..d0b809c1d44 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/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;
 
diff --git a/scripts/vm/hypervisor/xenserver/vmopsSnapshot b/scripts/vm/hypervisor/xenserver/vmopsSnapshot
index 85a5b2d956b..e85ca556080 100755
--- a/scripts/vm/hypervisor/xenserver/vmopsSnapshot
+++ b/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 = ''