cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/4.3-forward to 94ea273
Date Wed, 22 Jan 2014 12:10:23 GMT
Updated Branches:
  refs/heads/4.3-forward d5e0dcd2a -> 94ea2736f


CLOUDSTACK-5927. Storage garbage collector is trying to destroy the SSVM/CPVM root disk that
is in use.
In case of VMware VM during root volume preparation if we are switching to a new volume, force
expunge root disk that was created from the old template.
Because otherwise storage garbage collector will later try to expunge the old disk marked
for expunge and fail with 'Cannot delete file' exception
since in VMware the new root vmdk has the same name and is now in use.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94ea2736
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94ea2736
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94ea2736

Branch: refs/heads/4.3-forward
Commit: 94ea2736f4a1614e45f4bc56388aad7adeb22a08
Parents: d5e0dcd
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Sun Nov 10 23:31:56 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Wed Jan 22 17:32:13 2014 +0530

----------------------------------------------------------------------
 .../engine/orchestration/VolumeOrchestrator.java         | 11 ++++++++++-
 .../cloud/storage/resource/VmwareStorageProcessor.java   |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94ea2736/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 4619969..a3ab5a4 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -808,7 +808,16 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                 } catch (NoTransitionException e) {
                     s_logger.debug("Unable to destroy existing volume: " + e.toString());
                 }
-
+                // In case of VMware VM will continue to use the old root disk until expunged,
so force expunge old root disk
+                if (vm.getHypervisorType() == HypervisorType.VMware) {
+                    s_logger.info("Expunging volume " + existingVolume.getId() + " from primary
data store");
+                    AsyncCallFuture<VolumeApiResult> future = volService.expungeVolumeAsync(volFactory.getVolume(existingVolume.getId()));
+                    try {
+                        future.get();
+                    } catch (Exception e) {
+                        s_logger.debug("Failed to expunge volume:" + existingVolume.getId(),
e);
+                    }
+                }
                 return newVolume;
             }
         });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94ea2736/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 1e4f8d7..2089c08 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -363,9 +363,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
             // restoreVM - move the new ROOT disk into corresponding VM folder
             String vmInternalCSName = volume.getVmName();
             if (dsMo.folderExists(String.format("[%s]", dsMo.getName()), vmInternalCSName))
{
-                String oldRootDisk = VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(dsMo,
vmInternalCSName, vmdkFileBaseName);
-                if (oldRootDisk != null)
-                    VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmInternalCSName,
dsMo, vmdkFileBaseName);
+                VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo, vmInternalCSName,
dsMo, vmdkName);
             }
 
             VolumeObjectTO newVol = new VolumeObjectTO();


Mime
View raw message