etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.15' into main

This commit is contained in:
nicolas 2021-08-28 01:11:52 -03:00
parent 7f4f3f7f1a e968f3b16a
commit 8860fc8143
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

@ -3059,7 +3059,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
stopVirtualMachine(vmId, VmDestroyForcestop.value());
detachVolumesFromVm(volumesToBeDeleted);
// Detach all data disks from VM
List<VolumeVO> dataVols = _volsDao.findByInstanceAndType(vmId, Volume.Type.DATADISK);
detachVolumesFromVm(dataVols);
UserVm destroyedVm = destroyVm(vmId, expunge);
if (expunge) {
@ -3068,7 +3070,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
deleteVolumesFromVm(volumesToBeDeleted);
deleteVolumesFromVm(volumesToBeDeleted, expunge);
return destroyedVm;
}
@ -7538,13 +7540,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
StringBuilder sb = new StringBuilder();
for (VolumeVO volume : volumes) {
if (volume.getInstanceId() == null || vmId != volume.getInstanceId()) {
if (volume.getInstanceId() == null || vmId != volume.getInstanceId() || volume.getVolumeType() != Volume.Type.DATADISK) {
sb.append(volume.toString() + "; ");
}
}
if (!StringUtils.isEmpty(sb.toString())) {
throw new InvalidParameterValueException("The following supplied volumes are not attached to the VM: " + sb.toString());
throw new InvalidParameterValueException("The following supplied volumes are not DATADISK attached to the VM: " + sb.toString());
}
}
@ -7569,13 +7571,13 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
private void deleteVolumesFromVm(List<VolumeVO> volumes) {
private void deleteVolumesFromVm(List<VolumeVO> volumes, boolean expunge) {
for (VolumeVO volume : volumes) {
boolean deleteResult = _volumeService.deleteVolume(volume.getId(), CallContext.current().getCallingAccount());
Volume result = _volumeService.destroyVolume(volume.getId(), CallContext.current().getCallingAccount(), expunge, false);
if (!deleteResult) {
if (result == null) {
s_logger.error("DestroyVM remove volume - failed to delete volume " + volume.getInstanceId() + " from instance " + volume.getId());
}
}