abh1sar commented on code in PR #10017:
URL: https://github.com/apache/cloudstack/pull/10017#discussion_r1872929331
##########
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java:
##########
@@ -502,13 +577,61 @@ public boolean createBackup(final Long vmId) {
throw new CloudRuntimeException("The assigned backup offering does
not allow ad-hoc user backup");
}
+ Backup.Type type = getBackupType(scheduleId);
+ Account owner = accountManager.getAccount(vm.getAccountId());
+ try {
+ resourceLimitMgr.checkResourceLimit(owner,
Resource.ResourceType.backup);
+ } catch (ResourceAllocationException e) {
+ if (type != Backup.Type.MANUAL) {
+ String msg = "Backup resource limit exceeded for account id :
" + owner.getId() + ". Failed to create backup";
+ logger.warn(msg);
+
alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT,
0L, 0L, msg, "Backup resource limit exceeded for account id : " + owner.getId()
+ + ". Failed to create backups; please use
updateResourceLimit to increase the limit");
+ }
+ throw e;
+ }
+
+ Long backupSize = 0L;
+ for (final Volume volume: volumeDao.findByInstance(vmId)) {
+ if (Volume.State.Ready.equals(volume.getState())) {
+ backupSize += volume.getSize();
+ }
+ }
+ try {
+ resourceLimitMgr.checkResourceLimit(owner,
Resource.ResourceType.backup_storage, backupSize);
+ } catch (ResourceAllocationException e) {
+ if (type != Backup.Type.MANUAL) {
+ String msg = "Backup storage space resource limit exceeded for
account id : " + owner.getId() + ". Failed to create backup";
+ logger.warn(msg);
+
alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT,
0L, 0L, msg, "Backup storage space resource limit exceeded for account id : " +
owner.getId()
+ + ". Failed to create backups; please use
updateResourceLimit to increase the limit");
+ }
+ throw e;
+ }
+
ActionEventUtils.onStartedActionEvent(User.UID_SYSTEM,
vm.getAccountId(),
EventTypes.EVENT_VM_BACKUP_CREATE, "creating backup for VM
ID:" + vm.getUuid(),
vmId, ApiCommandResourceType.VirtualMachine.toString(),
true, 0);
+
final BackupProvider backupProvider =
getBackupProvider(offering.getProvider());
- if (backupProvider != null && backupProvider.takeBackup(vm)) {
+ if (backupProvider != null) {
+ Pair<Boolean, Backup> result = backupProvider.takeBackup(vm);
+ if (result.first() == false) {
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
