small fix on cleanup

Author: JoaoJandre

core/src/main/java/org/apache/cloudstack/backup/CleanupKbossBackupErrorAnswer.java

@@ -27,13 +27,19 @@
 
 public class CleanupKbossBackupErrorAnswer extends Answer {
     List<VolumeObjectTO> volumeObjectTos;
+    boolean vmRunning;
 
-    public CleanupKbossBackupErrorAnswer(Command cmd, List<VolumeObjectTO> volumeObjectTos) {
+    public CleanupKbossBackupErrorAnswer(Command cmd, List<VolumeObjectTO> volumeObjectTos, boolean vmRunning) {
         super(cmd, CollectionUtils.isNotEmpty(volumeObjectTos), null);
         this.volumeObjectTos = volumeObjectTos;
+        this.vmRunning = vmRunning;
     }
 
     public List<VolumeObjectTO> getVolumeObjectTos() {
         return volumeObjectTos;
     }
+
+    public boolean isVmRunning() {
+        return vmRunning;
+    }
 }

plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java

@@ -378,7 +378,7 @@ public Pair<Boolean, Long> orchestrateTakeBackup(Backup backup, boolean quiesceV
         Long hostId = vmSnapshotHelper.pickRunningHost(vmId);
         HostVO hostVO = hostDao.findById(hostId);
 
-        if (hostVO.getStatus() == Status.Down || hostVO.getStatus() == Status.Disconnected) {
+        if (hostVO.getStatus() != Status.Up || hostVO.getResourceState() != ResourceState.Enabled) {
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.update(backupVO.getId(), backupVO);
 
@@ -927,6 +927,7 @@ public boolean finishBackupChain(VirtualMachine virtualMachine) {
             }
         }
 
+        runningVM = cleanAnswer.isVmRunning();
         userVmVO.setState(runningVM ? VirtualMachine.State.Running : VirtualMachine.State.Stopped);
         userVmDao.update(userVmVO.getId(), userVmVO);
         userVmDetailsDao.removeDetail(userVmVO.getId(), ApiConstants.LAST_KNOWN_STATE);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupKbossVmBackupCommandWrapper.java

@@ -26,6 +26,7 @@
 import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
 import org.apache.cloudstack.backup.CleanupKbossBackupErrorAnswer;
 import org.apache.cloudstack.backup.CleanupKbossBackupErrorCommand;
 import org.apache.cloudstack.storage.to.BackupDeltaTO;
@@ -57,23 +58,24 @@ public Answer execute(CleanupKbossBackupErrorCommand command, LibvirtComputingRe
         cleanupBackupDeltasOnSecondary(command, storagePoolManager, kbossTOS);
 
         if (command.isRunningVM()) {
-            return new CleanupKbossBackupErrorAnswer(command, cleanupRunningVm(command, serverResource));
+            Pair<List<VolumeObjectTO>, Boolean> volumeTosAndIsVmRunning = cleanupRunningVm(command, serverResource);
+            return new CleanupKbossBackupErrorAnswer(command, volumeTosAndIsVmRunning.first(), volumeTosAndIsVmRunning.second());
         }
 
-        return new CleanupKbossBackupErrorAnswer(command, mergeDeltasForStoppedVmIfNeeded(command, serverResource));
+        return new CleanupKbossBackupErrorAnswer(command, mergeDeltasForStoppedVmIfNeeded(command, serverResource), false);
     }
 
-    private List<VolumeObjectTO> cleanupRunningVm(CleanupKbossBackupErrorCommand command, LibvirtComputingResource serverResource) {
+    private Pair<List<VolumeObjectTO>, Boolean> cleanupRunningVm(CleanupKbossBackupErrorCommand command, LibvirtComputingResource serverResource) {
         Domain dm = null;
         try {
             dm = serverResource.getDomain(serverResource.getLibvirtUtilitiesHelper().getConnection(), command.getVmName());
-            return mergeDeltasForRunningVmIfNeeded(command, serverResource, dm);
+            return new Pair<>(mergeDeltasForRunningVmIfNeeded(command, serverResource, dm), true);
         } catch (LibvirtException e) {
             if (e.getError().getCode() == Error.ErrorNumber.VIR_ERR_NO_DOMAIN && IsVmReallyStopped(command, serverResource)) {
-                return mergeDeltasForStoppedVmIfNeeded(command, serverResource);
+                return new Pair<>(mergeDeltasForStoppedVmIfNeeded(command, serverResource), false);
             }
             logger.error("Error while trying to get VM [{}]. Aborting the process.", command.getVmName(), e);
-            return List.of();
+            return new Pair<>(List.of(), false);
         } finally {
             if (dm != null) {
                 try {