abh1sar commented on code in PR #11258:
URL: https://github.com/apache/cloudstack/pull/11258#discussion_r2224882330
##########
server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java:
##########
@@ -277,7 +278,8 @@ public boolean deleteBackupOffering(final Long offeringId) {
public static String createVolumeInfoFromVolumes(List<VolumeVO> vmVolumes)
{
Review Comment:
can't change VolumeVO to Volume as callers are sending VolumeVO.
But I have changed Volume to VolumVO within this method to be consistent
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -62,16 +62,21 @@ public Answer execute(RestoreBackupCommand command,
LibvirtComputingResource ser
String restoreVolumeUuid = command.getRestoreVolumeUUID();
String newVolumeId = null;
- if (Objects.isNull(vmExists)) {
- String volumePath = volumePaths.get(0);
- int lastIndex = volumePath.lastIndexOf("/");
- newVolumeId = volumePath.substring(lastIndex + 1);
- restoreVolume(backupPath, backupRepoType, backupRepoAddress,
volumePath, diskType, restoreVolumeUuid,
- new Pair<>(vmName, command.getVmState()), mountOptions);
- } else if (Boolean.TRUE.equals(vmExists)) {
- restoreVolumesOfExistingVM(volumePaths, backupPath,
backupRepoType, backupRepoAddress, mountOptions);
- } else {
- restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath,
backupRepoType, backupRepoAddress, mountOptions);
+ try {
+ if (Objects.isNull(vmExists)) {
+ String volumePath = volumePaths.get(0);
+ int lastIndex = volumePath.lastIndexOf("/");
+ newVolumeId = volumePath.substring(lastIndex + 1);
+ restoreVolume(backupPath, backupRepoType, backupRepoAddress,
volumePath, diskType, restoreVolumeUuid,
+ new Pair<>(vmName, command.getVmState()),
mountOptions);
+ } else if (Boolean.TRUE.equals(vmExists)) {
+ restoreVolumesOfExistingVM(volumePaths, backupPath,
backupRepoType, backupRepoAddress, mountOptions);
+ } else {
+ restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath,
backupRepoType, backupRepoAddress, mountOptions);
+ }
+ } catch (CloudRuntimeException e) {
+ logger.error("Failed to restore backup for VM: " + vmName, e);
+ return new BackupAnswer(command, false, e.getMessage());
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
