From bd0bc0f39db366b16725f08920802f79ef966ff3 Mon Sep 17 00:00:00 2001
From: Pierre Charton <p.charton@dimsi.fr>
Date: Fri, 15 Nov 2024 11:13:26 +0100
Subject: [PATCH] Don't delete backup when we dissociate backup offering

---
 .../backup/BackrollBackupProvider.java        | 29 +------------------
 ui/src/store/modules/user.js                  |  2 +-
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
index 6b5cce53449..f8fd1c59c88 100644
--- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
+++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
@@ -168,34 +168,7 @@ public class BackrollBackupProvider extends AdapterBase implements BackupProvide
 
     @Override
     public boolean removeVMFromBackupOffering(VirtualMachine vm) {
-        logger.info("Removing VM ID {} from Backrool backup offering ", vm.getUuid());
-
-        boolean isAnyProblemWhileRemovingBackups = false;
-
-        List<Backup> backupsInCs = backupDao.listByVmId(null, vm.getId());
-
-        for (Backup backup : backupsInCs) {
-            logger.debug("Trying to remove backup with id {}", backup.getId());
-
-            try {
-                if (getClient(backup.getZoneId()).deleteBackup(vm.getUuid(), getBackupName(backup))) {
-                    logger.info("Backup {} deleted in Backroll for virtual machine {}", backup.getId(), vm.getName());
-                    if (!backupDao.remove(backup.getId())){
-                        isAnyProblemWhileRemovingBackups = true;
-                    }
-                    logger.info("Backup {} deleted in CS for virtual machine {}", backup.getId(), vm.getName());
-                } else {
-                    isAnyProblemWhileRemovingBackups = false;
-                }
-            } catch (KeyManagementException | NoSuchAlgorithmException | IOException e) {
-                throw new CloudRuntimeException("Failed to remove VM from backup offering");
-            }
-        }
-
-        if (isAnyProblemWhileRemovingBackups) {
-            logger.info("Problems occured while removing some backups for virtual machine {}", vm.getName());
-        }
-        return isAnyProblemWhileRemovingBackups;
+        return true;
     }
 
     @Override
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index bd0afaa17bf..1b23818db24 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -424,7 +424,7 @@ const user = {
           const ldapEnable = (response.ldapconfigurationresponse.count > 0)
           commit('SET_LDAP', ldapEnable)
         }).catch(error => {
-          reject(error)
+          console.error(error)
         })
 
         api('cloudianIsEnabled').then(response => {