You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/02/14 17:38:37 UTC
[GitHub] [cloudstack] GutoVeronezi commented on a change in pull request #5903: [Veeam] Change the VM assign flow logic in a Backup Offering
GutoVeronezi commented on a change in pull request #5903:
URL: https://github.com/apache/cloudstack/pull/5903#discussion_r806086765
##########
File path: server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
##########
@@ -287,24 +288,43 @@ public boolean assignVMToBackupOffering(Long vmId, Long offeringId) {
throw new CloudRuntimeException("Failed to get the backup provider for the zone, please contact the administrator");
}
- vm.setBackupOfferingId(offering.getId());
- vm.setBackupVolumes(createVolumeInfoFromVolumes(volumeDao.findByInstance(vm.getId())));
- if (vmInstanceDao.update(vm.getId(), vm)) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
- "Backup-" + vm.getHostName() + "-" + vm.getUuid(), vm.getBackupOfferingId(), null, null,
- Backup.class.getSimpleName(), vm.getUuid());
- } else {
- throw new CloudRuntimeException("Failed to update VM assignment to the backup offering in the DB, please try again.");
- }
+ return transactionAssignVMToBackupOffering(vm, offering, backupProvider) != null;
+ }
- try {
- if (backupProvider.assignVMToBackupOffering(vm, offering)) {
- return vmInstanceDao.update(vm.getId(), vm);
+ private VMInstanceVO transactionAssignVMToBackupOffering(VMInstanceVO vm, BackupOfferingVO offering, BackupProvider backupProvider) {
+ return Transaction.execute(TransactionLegacy.CLOUD_DB, new TransactionCallback<VMInstanceVO>() {
+ @Override
+ public VMInstanceVO doInTransaction(final TransactionStatus status) {
+ try {
+ long vmId = vm.getId();
+ vm.setBackupOfferingId(offering.getId());
+ vm.setBackupVolumes(createVolumeInfoFromVolumes(volumeDao.findByInstance(vmId)));
+
+ if (backupProvider.assignVMToBackupOffering(vm, offering)) {
Review comment:
As `else` will throw an exception, we could invert this condition to reduce indentation.
##########
File path: server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
##########
@@ -287,24 +288,43 @@ public boolean assignVMToBackupOffering(Long vmId, Long offeringId) {
throw new CloudRuntimeException("Failed to get the backup provider for the zone, please contact the administrator");
}
- vm.setBackupOfferingId(offering.getId());
- vm.setBackupVolumes(createVolumeInfoFromVolumes(volumeDao.findByInstance(vm.getId())));
- if (vmInstanceDao.update(vm.getId(), vm)) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_BACKUP_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(),
- "Backup-" + vm.getHostName() + "-" + vm.getUuid(), vm.getBackupOfferingId(), null, null,
- Backup.class.getSimpleName(), vm.getUuid());
- } else {
- throw new CloudRuntimeException("Failed to update VM assignment to the backup offering in the DB, please try again.");
- }
+ return transactionAssignVMToBackupOffering(vm, offering, backupProvider) != null;
+ }
- try {
- if (backupProvider.assignVMToBackupOffering(vm, offering)) {
- return vmInstanceDao.update(vm.getId(), vm);
+ private VMInstanceVO transactionAssignVMToBackupOffering(VMInstanceVO vm, BackupOfferingVO offering, BackupProvider backupProvider) {
+ return Transaction.execute(TransactionLegacy.CLOUD_DB, new TransactionCallback<VMInstanceVO>() {
+ @Override
+ public VMInstanceVO doInTransaction(final TransactionStatus status) {
+ try {
+ long vmId = vm.getId();
+ vm.setBackupOfferingId(offering.getId());
+ vm.setBackupVolumes(createVolumeInfoFromVolumes(volumeDao.findByInstance(vmId)));
+
+ if (backupProvider.assignVMToBackupOffering(vm, offering)) {
+ if (vmInstanceDao.update(vmId, vm)) {
Review comment:
As `else` will throw an exception, we could invert this condition to reduce indentation.
--
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-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org