Skip to content

Veeam BnR : Fix for error in remove backup offering #10562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pearl1594 merged 1 commit into from
Mar 17, 2025
Merged

Veeam BnR : Fix for error in remove backup offering #10562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@
public boolean removeVMFromBackupOffering(final VirtualMachine vm) {
final VeeamClient client = getClient(vm.getDataCenterId());
final VmwareDatacenter vmwareDC = findVmwareDatacenterForVM(vm);
if (vm.getBackupExternalId() == null) {
throw new CloudRuntimeException("The VM does not have a backup job assigned.");

Check warning on line 203 in plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java

View check run for this annotation

Codecov / codecov/patch

plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java#L203 

Added line #L203 was not covered by tests
}
try {
if (!client.removeVMFromVeeamJob(vm.getBackupExternalId(), vm.getInstanceName(), vmwareDC.getVcenterHost())) {
LOG.warn("Failed to remove VM from Veeam Job id: " + vm.getBackupExternalId());
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,10 @@

boolean result = false;
try {
result = backupProvider.removeVMFromBackupOffering(vm);

Check warning on line 371 in server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java#L371 

Added line #L371 was not covered by tests
vm.setBackupOfferingId(null);
vm.setBackupExternalId(null);
vm.setBackupVolumes(null);
result = backupProvider.removeVMFromBackupOffering(vm);
vm.setBackupExternalId(null);

Check warning on line 374 in server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java#L374 

Added line #L374 was not covered by tests
if (result && backupProvider.willDeleteBackupsOnOfferingRemoval()) {
final List<Backup> backups = backupDao.listByVmId(null, vm.getId());
for (final Backup backup : backups) {
Expand Down