(cloudstack) branch 4.19 updated: Veeam: revert unnecessary state change if restore backup and attach to another VM (#8614)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new a924a110e18 Veeam: revert unnecessary state change if restore backup 
and attach to another VM (#8614)
a924a110e18 is described below

commit a924a110e183b70e7c0ec008bd9f5ba7da80a124
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Fri Feb 9 16:29:59 2024 +0100

    Veeam: revert unnecessary state change if restore backup and attach to 
another VM (#8614)
---
 .../src/main/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 2e45066ff60..36978ab2f87 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 class BackupManagerImpl extends ManagerBase 
implements BackupManager {
         String[] hostPossibleValues = {host.getPrivateIpAddress(), 
host.getName()};
         String[] datastoresPossibleValues = {datastore.getUuid(), 
datastore.getName()};
 
-        updateVmState(vm, VirtualMachine.Event.RestoringRequested, 
VirtualMachine.State.Restoring);
         Pair<Boolean, String> 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;
     }