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

[pearl11594]

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit e091aad792b7afb46e8d7521badc54940e96e6ca
Merge: f8adedc2802 35e809e7ce4
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Mon Mar 17 13:26:26 2025 -0400

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

 .../main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java   | 3 +++
 .../src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc 
plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
index 50caa2ea888,e8b65e19e0b..5cd845762fe
--- 
a/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
+++ 
b/plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/VeeamBackupProvider.java
@@@ -200,12 -199,15 +200,15 @@@ public class VeeamBackupProvider extend
      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.");
+         }
          try {
              if (!client.removeVMFromVeeamJob(vm.getBackupExternalId(), 
vm.getInstanceName(), vmwareDC.getVcenterHost())) {
 -                LOG.warn("Failed to remove VM from Veeam Job id: " + 
vm.getBackupExternalId());
 +                logger.warn("Failed to remove VM from Veeam Job id: " + 
vm.getBackupExternalId());
              }
          } catch (Exception e) {
 -            LOG.debug("VM was removed from the job so could not remove again, 
trying to delete the veeam job now.", e);
 +            logger.debug("VM was removed from the job so could not remove 
again, trying to delete the veeam job now.", e);
          }
  
          final String clonedJobName = getGuestBackupName(vm.getInstanceName(), 
vm.getUuid());