From ad6d7ff9d22ed72846efb51668513852a48c5595 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Wed, 16 Nov 2011 18:01:52 -0800
Subject: [PATCH] bug 12039,12041: when taking snapshot for detached volume,
 keep the worker VM around until backup copy to SSVM is done

Reviewed-by: Frank
---
 .../manager/VmwareStorageManagerImpl.java     | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index cec0314fdc4..b549d0736de 100644
--- a/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ b/core/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -162,7 +162,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
 		String snapshotBackupUuid = null;
 
 		VmwareContext context = hostService.getServiceContext(cmd);
-		VirtualMachineMO vmMo;
+		VirtualMachineMO vmMo = null;
 		
 		try {
 			VmwareHypervisorHost hyperHost = hostService.getHyperHost(context, cmd);
@@ -205,30 +205,31 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
 	                    throw new Exception("Failed to take snapshot " + cmd.getSnapshotName() + " on vm: " + cmd.getVmName());
 	                }
 				}
+				
+                snapshotBackupUuid = backupSnapshotToSecondaryStorage(vmMo, accountId,
+                        volumeId, cmd.getVolumePath(), snapshotUuid,
+                        secondaryStoragePoolURL, prevSnapshotUuid,
+                        prevBackupUuid,
+                        UUID.randomUUID().toString().replace("-", ""));
+
+                success = (snapshotBackupUuid != null);
+                if (success) {
+                    details = "Successfully backedUp the snapshotUuid: " + snapshotUuid + " to secondary storage.";
+                }
+				
 			} finally {
+                if(vmMo != null)
+                    vmMo.removeAllSnapshots();
+			    
 				try {
 		            if (workerVm != null) {
 		                // detach volume and destroy worker vm
-		            	workerVm.moveAllVmDiskFiles(dsMo, "", false);
 		                workerVm.detachAllDisks();
 		                workerVm.destroy();
 		            }
 		        } catch (Throwable e) {
 		        	s_logger.warn("Failed to destroy worker VM: " + workerVMName);
-		        }			
-			}
-
-			snapshotBackupUuid = backupSnapshotToSecondaryStorage(vmMo, accountId,
-							volumeId, cmd.getVolumePath(), snapshotUuid,
-							secondaryStoragePoolURL, prevSnapshotUuid,
-							prevBackupUuid,
-							hostService.getWorkerName(context, cmd));
-
-			success = (snapshotBackupUuid != null);
-
-			if (success) {
-				details = "Successfully backedUp the snapshotUuid: " + snapshotUuid + " to secondary storage.";
-				vmMo.removeAllSnapshots();
+		        }
 			}
 		} catch (Throwable e) {
 			if (e instanceof RemoteException) {