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

Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20

Browse Source
This commit is contained in:
Pearl Dsilva 2025-03-17 13:26:26 -04:00
commit e091aad792
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
View File

@ -200,6 +200,9 @@ public class VeeamBackupProvider extends AdapterBase implements BackupProvider,
public boolean removeVMFromBackupOffering(final VirtualMachine vm) { public boolean removeVMFromBackupOffering(final VirtualMachine vm) {
final VeeamClient client = getClient(vm.getDataCenterId()); final VeeamClient client = getClient(vm.getDataCenterId());
final VmwareDatacenter vmwareDC = findVmwareDatacenterForVM(vm); final VmwareDatacenter vmwareDC = findVmwareDatacenterForVM(vm);
if (vm.getBackupExternalId() == null) {
throw new CloudRuntimeException("The VM does not have a backup job assigned.");
}
try { try {
if (!client.removeVMFromVeeamJob(vm.getBackupExternalId(), vm.getInstanceName(), vmwareDC.getVcenterHost())) { if (!client.removeVMFromVeeamJob(vm.getBackupExternalId(), vm.getInstanceName(), vmwareDC.getVcenterHost())) {
logger.warn("Failed to remove VM from Veeam Job id: " + vm.getBackupExternalId()); logger.warn("Failed to remove VM from Veeam Job id: " + vm.getBackupExternalId());

6
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View File

@ -380,10 +380,10 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
boolean result = false; boolean result = false;
try { try {
vm.setBackupOfferingId(null);
vm.setBackupExternalId(null);
vm.setBackupVolumes(null);
result = backupProvider.removeVMFromBackupOffering(vm); result = backupProvider.removeVMFromBackupOffering(vm);
vm.setBackupOfferingId(null);
vm.setBackupVolumes(null);
vm.setBackupExternalId(null);
if (result && backupProvider.willDeleteBackupsOnOfferingRemoval()) { if (result && backupProvider.willDeleteBackupsOnOfferingRemoval()) {
final List<Backup> backups = backupDao.listByVmId(null, vm.getId()); final List<Backup> backups = backupDao.listByVmId(null, vm.getId());
for (final Backup backup : backups) { for (final Backup backup : backups) {