apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deploy as-is disks cleanup

Browse Source
This commit is contained in:
nvazquez 2020-09-25 03:32:41 -03:00 committed by Harikrishna Patnala
parent 41354227e2
commit 7a8dd46b32
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/apache/cloudstack/storage/to/VolumeObjectTO.java
View File

@ -62,6 +62,7 @@ public class VolumeObjectTO implements DataTO {
private Hypervisor.HypervisorType hypervisorType; private Hypervisor.HypervisorType hypervisorType;
private MigrationOptions migrationOptions; private MigrationOptions migrationOptions;
private boolean directDownload; private boolean directDownload;
private boolean deployAsIs;
public VolumeObjectTO() { public VolumeObjectTO() {
@ -102,6 +103,7 @@ public class VolumeObjectTO implements DataTO {
setDeviceId(volume.getDeviceId()); setDeviceId(volume.getDeviceId());
this.migrationOptions = volume.getMigrationOptions(); this.migrationOptions = volume.getMigrationOptions();
this.directDownload = volume.isDirectDownload(); this.directDownload = volume.isDirectDownload();
this.deployAsIs = volume.isDeployAsIs();
} }
public String getUuid() { public String getUuid() {
@ -313,4 +315,8 @@ public class VolumeObjectTO implements DataTO {
public boolean isDirectDownload() { public boolean isDirectDownload() {
return directDownload; return directDownload;
} }
public boolean isDeployAsIs() {
return deployAsIs;
}
} }

25
plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
View File

@ -2474,9 +2474,14 @@ public class VmwareStorageProcessor implements StorageProcessor {
List<Map<String, String>> dynamicTargetsToRemove = null; List<Map<String, String>> dynamicTargetsToRemove = null;
boolean deployAsIs = vol.isDeployAsIs();
if (vmMo != null) { if (vmMo != null) {
if (s_logger.isInfoEnabled()) { if (s_logger.isInfoEnabled()) {
s_logger.info("Destroy root volume and VM itself. vmName " + vmName); if (deployAsIs) {
s_logger.info("Destroying root volume " + vol.getPath() + " of deploy-as-is VM " + vmName);
} else {
s_logger.info("Destroy root volume and VM itself. vmName " + vmName);
}
} }
VirtualMachineDiskInfo diskInfo = null; VirtualMachineDiskInfo diskInfo = null;
@ -2524,6 +2529,24 @@ public class VmwareStorageProcessor implements StorageProcessor {
} }
} }
} }
} else if (deployAsIs) {
if (s_logger.isInfoEnabled()) {
s_logger.info("Destroying root volume " + vol.getPath() + " of already removed deploy-as-is VM " + vmName);
}
// The disks of the deploy-as-is VM have been detached from the VM and moved to root folder
String deployAsIsRootDiskPath = dsMo.searchFileInSubFolders(vol.getPath() + VmwareResource.VMDK_EXTENSION,
true, null);
if (StringUtils.isNotBlank(deployAsIsRootDiskPath)) {
if (s_logger.isInfoEnabled()) {
s_logger.info("Removing disk " + deployAsIsRootDiskPath);
}
dsMo.deleteFile(deployAsIsRootDiskPath, morDc, true);
String deltaFilePath = dsMo.searchFileInSubFolders(vol.getPath() + "-delta" + VmwareResource.VMDK_EXTENSION,
true, null);
if (StringUtils.isNotBlank(deltaFilePath)) {
dsMo.deleteFile(deltaFilePath, morDc, true);
}
}
} }
/* /*