Skip to content

Commit bd0bc0f

Browse files
committed
Don't delete backup when we dissociate backup offering
1 parent 4e0ea82 commit bd0bc0f

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -168,34 +168,7 @@ public Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vir
168168

169169
@Override
170170
public boolean removeVMFromBackupOffering(VirtualMachine vm) {
171-
logger.info("Removing VM ID {} from Backrool backup offering ", vm.getUuid());
172-
173-
boolean isAnyProblemWhileRemovingBackups = false;
174-
175-
List<Backup> backupsInCs = backupDao.listByVmId(null, vm.getId());
176-
177-
for (Backup backup : backupsInCs) {
178-
logger.debug("Trying to remove backup with id {}", backup.getId());
179-
180-
try {
181-
if (getClient(backup.getZoneId()).deleteBackup(vm.getUuid(), getBackupName(backup))) {
182-
logger.info("Backup {} deleted in Backroll for virtual machine {}", backup.getId(), vm.getName());
183-
if (!backupDao.remove(backup.getId())){
184-
isAnyProblemWhileRemovingBackups = true;
185-
}
186-
logger.info("Backup {} deleted in CS for virtual machine {}", backup.getId(), vm.getName());
187-
} else {
188-
isAnyProblemWhileRemovingBackups = false;
189-
}
190-
} catch (KeyManagementException | NoSuchAlgorithmException | IOException e) {
191-
throw new CloudRuntimeException("Failed to remove VM from backup offering");
192-
}
193-
}
194-
195-
if (isAnyProblemWhileRemovingBackups) {
196-
logger.info("Problems occured while removing some backups for virtual machine {}", vm.getName());
197-
}
198-
return isAnyProblemWhileRemovingBackups;
171+
return true;
199172
}
200173

201174
@Override

ui/src/store/modules/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ const user = {
424424
const ldapEnable = (response.ldapconfigurationresponse.count > 0)
425425
commit('SET_LDAP', ldapEnable)
426426
}).catch(error => {
427-
reject(error)
427+
console.error(error)
428428
})
429429

430430
api('cloudianIsEnabled').then(response => {

0 commit comments

Comments
 (0)