lookup in cluster for host

Author: sudo87

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2052,18 +2052,12 @@ void persistDomainForKVM(VMInstanceVO vm) {
         String vmName = vm.getName();
         UnmanageInstanceCommand unmanageInstanceCommand;
         if (State.Stopped.equals(vm.getState())) {
-            Pair<Long, Long> clusterAndHostId = findClusterAndHostIdForVm(vm.getLastHostId());
+            Pair<Long, Long> clusterAndHostId = findClusterAndHostIdForVm(vm, false);
             hostId = clusterAndHostId.second();
             if (hostId == null) {
-                logger.debug("No previous host found for Instance: {}. " +
-                        "Searching for any available hosts in Zone with ID: {}.", vmName, vm.getDataCenterId());
-                List <HostVO> availableHosts = _hostDao.listByDataCenterIdAndHypervisorType(vm.getDataCenterId(), HypervisorType.KVM);
-                 if (availableHosts.isEmpty()) {
-                     String errorMsg = "No available host to persist domainXML for Instance: " + vmName;
-                     logger.debug(errorMsg);
-                     throw new CloudRuntimeException(errorMsg);
-                 }
-                 hostId = availableHosts.get(0).getId();
+                String errorMsg = "No available host to persist domain XML for Instance: " + vmName;
+                logger.debug(errorMsg);
+                throw new CloudRuntimeException(errorMsg);
             }
             unmanageInstanceCommand = new UnmanageInstanceCommand(prepVmSpecForUnmanageCmd(vm.getId(), hostId)); // reconstruct vmSpec for stopped instance
         } else {
@@ -2073,7 +2067,7 @@ void persistDomainForKVM(VMInstanceVO vm) {
         try {
             Answer answer = _agentMgr.send(hostId, unmanageInstanceCommand);
             if (!answer.getResult()) {
-                String errorMsg = "Failed to persist domainXML for instance: " + vmName;
+                String errorMsg = "Failed to persist domain XML for instance: " + vmName;
                 logger.debug(errorMsg);
                 throw new CloudRuntimeException(errorMsg);
             }
@@ -6273,8 +6267,9 @@ public Pair<Long, Long> findClusterAndHostIdForVm(VirtualMachine vm, boolean ski
         host = host == null ? _hostDao.findById(hostId) : host;
         if (host != null) {
             clusterId = host.getClusterId();
+            return new Pair<>(clusterId, hostId);
         }
-        return new Pair<>(clusterId, hostId);
+        return findClusterAndHostIdForVmFromVolumes(vm.getId());
     }
 
     private Pair<Long, Long> findClusterAndHostIdForVm(VirtualMachine vm) {

engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java

@@ -1765,13 +1765,12 @@ public void testPersistDomainForKvmForRunningVmSuccess() throws AgentUnavailable
     @Test
     public void testPersistDomainForKvmForStoppedVmSuccess() throws AgentUnavailableException, OperationTimedoutException {
         when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Stopped);
-        when(vmInstanceMock.getLastHostId()).thenReturn(1L);
         VirtualMachineTO vmTO = new VirtualMachineTO() {};
         vmTO.setName(vmName);
         doReturn(vmTO).when(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
         UnmanageInstanceAnswer successAnswer = new UnmanageInstanceAnswer(null, true, "success");
         when(agentManagerMock.send(anyLong(), any(UnmanageInstanceCommand.class))).thenReturn(successAnswer);
-        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceVoMockId)).thenReturn(new Pair<>(1L, 1L));
+        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceMock, false)).thenReturn(new Pair<>(clusterMockId, hostMockId));
         virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock);
         ArgumentCaptor<Long> hostIdCaptor = ArgumentCaptor.forClass(Long.class);
         ArgumentCaptor<UnmanageInstanceCommand> commandCaptor = ArgumentCaptor.forClass(UnmanageInstanceCommand.class);
@@ -1786,37 +1785,13 @@ public void testPersistDomainForKvmForStoppedVmSuccess() throws AgentUnavailable
 
 
     @Test
-    public void testPersistDomainForKvmForStoppedVmHostRemoved() throws AgentUnavailableException, OperationTimedoutException {
+    public void testPersistDomainForKvmForStoppedVmNoHost() {
         when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Stopped);
-        when(vmInstanceMock.getLastHostId()).thenReturn(1L);
-        when(vmInstanceMock.getDataCenterId()).thenReturn(zoneMockId);
-        VirtualMachineTO vmTO = new VirtualMachineTO() {};
-        vmTO.setName(vmName);
-        doReturn(vmTO).when(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
-        UnmanageInstanceAnswer successAnswer = new UnmanageInstanceAnswer(null, true, "success");
-        when(agentManagerMock.send(anyLong(), any(UnmanageInstanceCommand.class))).thenReturn(successAnswer);
-        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceVoMockId)).thenReturn(new Pair<>(clusterMockId, null));
-        when(hostDaoMock.listByDataCenterIdAndHypervisorType(zoneMockId, HypervisorType.KVM)).thenReturn(List.of(hostMock));
-        virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock);
-        ArgumentCaptor<Long> hostIdCaptor = ArgumentCaptor.forClass(Long.class);
-        ArgumentCaptor<UnmanageInstanceCommand> commandCaptor = ArgumentCaptor.forClass(UnmanageInstanceCommand.class);
-        verify(agentManagerMock).send(hostIdCaptor.capture(), commandCaptor.capture());
-        assertEquals(1L, hostIdCaptor.getValue().longValue());
-        UnmanageInstanceCommand sentCommand = commandCaptor.getValue();
-        assertNotNull(sentCommand.getVm());
-        assertEquals(vmTO, sentCommand.getVm());
-        assertEquals(vmName, sentCommand.getInstanceName());
-        verify(virtualMachineManagerImpl).prepVmSpecForUnmanageCmd(vmInstanceVoMockId, 1L);
-    }
-
-    @Test
-    public void testPersistDomainForKvmForStoppedVmNoHost() throws AgentUnavailableException, OperationTimedoutException {
-        when(vmInstanceMock.getState()).thenReturn(VirtualMachine.State.Stopped);
-        when(vmInstanceMock.getLastHostId()).thenReturn(1L);
         VirtualMachineTO vmTO = new VirtualMachineTO() {};
         vmTO.setName(vmName);
+        when(virtualMachineManagerImpl.findClusterAndHostIdForVm(vmInstanceMock, false)).thenReturn(new Pair<>(clusterMockId, null));
         CloudRuntimeException exception = assertThrows(CloudRuntimeException.class, () -> virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock));
-        assertEquals("No available host to persist domainXML for Instance: " + vmName, exception.getMessage());
+        assertEquals("No available host to persist domain XML for Instance: " + vmName, exception.getMessage());
     }
 
     @Test
@@ -1826,7 +1801,7 @@ public void testPersistDomainForKvmForRunningVmAgentFailure() throws AgentUnavai
         UnmanageInstanceAnswer failureAnswer = new UnmanageInstanceAnswer(null, false, "failure");
         when(agentManagerMock.send(anyLong(), any(UnmanageInstanceCommand.class))).thenReturn(failureAnswer);
         CloudRuntimeException exception = assertThrows(CloudRuntimeException.class, () -> virtualMachineManagerImpl.persistDomainForKVM(vmInstanceMock));
-        assertEquals("Failed to persist domainXML for instance: " + vmName, exception.getMessage());
+        assertEquals("Failed to persist domain XML for instance: " + vmName, exception.getMessage());
     }
 
     @Test