From f7d6393d87aad8412031c8818259b5d5036712eb Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 6 Feb 2024 11:03:44 +0100 Subject: [PATCH] Veeam: revert unnecessary state change if restore backup and attach to another VM This PR reverts some changes in #7238 When restore backup of a VM and attach the volume to another VM, the original VM is not changed/touched, therefore the VM state should not be updated. --- .../java/org/apache/cloudstack/backup/BackupManagerImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index 2e45066ff605..36978ab2f871 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -770,20 +770,16 @@ public boolean restoreBackupVolumeAndAttachToVM(final String backedUpVolumeUuid, String[] hostPossibleValues = {host.getPrivateIpAddress(), host.getName()}; String[] datastoresPossibleValues = {datastore.getUuid(), datastore.getName()}; - updateVmState(vm, VirtualMachine.Event.RestoringRequested, VirtualMachine.State.Restoring); Pair result = restoreBackedUpVolume(backedUpVolumeUuid, backup, backupProvider, hostPossibleValues, datastoresPossibleValues); if (BooleanUtils.isFalse(result.first())) { - updateVmState(vm, VirtualMachine.Event.RestoringFailed, VirtualMachine.State.Stopped); throw new CloudRuntimeException(String.format("Error restoring volume [%s] of VM [%s] to host [%s] using backup provider [%s] due to: [%s].", backedUpVolumeUuid, vm.getUuid(), host.getUuid(), backupProvider.getName(), result.second())); } if (!attachVolumeToVM(vm.getDataCenterId(), result.second(), vmFromBackup.getBackupVolumeList(), backedUpVolumeUuid, vm, datastore.getUuid(), backup)) { - updateVmState(vm, VirtualMachine.Event.RestoringFailed, VirtualMachine.State.Stopped); throw new CloudRuntimeException(String.format("Error attaching volume [%s] to VM [%s]." + backedUpVolumeUuid, vm.getUuid())); } - updateVmState(vm, VirtualMachine.Event.RestoringSuccess, VirtualMachine.State.Stopped); return true; }