DaanHoogland commented on a change in pull request #2056: CLOUDSTACK-8829 : 
Consecutive cold migration fails.
URL: https://github.com/apache/cloudstack/pull/2056#discussion_r114310859
 
 

 ##########
 File path: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 ##########
 @@ -1832,19 +1829,26 @@ private void orchestrateStorageMigration(final String 
vmUuid, final StoragePool
                 // If VM was cold migrated between clusters belonging to two 
different VMware DCs,
                 // unregister the VM from the source host and cleanup the 
associated VM files.
                 if (vm.getHypervisorType().equals(HypervisorType.VMware)) {
+                    Long srcClusterId = null;
+                    Long srcHostId = vm.getHostId() != null ? vm.getHostId() : 
vm.getLastHostId();
+                    if (srcHostId != null) {
+                        HostVO srcHost = _hostDao.findById(srcHostId);
+                        srcClusterId = srcHost.getClusterId();
+                    }
+
                     final Long destClusterId = destPool.getClusterId();
                     if (srcClusterId != null && destClusterId != null && ! 
srcClusterId.equals(destClusterId)) {
                         final String srcDcName = 
_clusterDetailsDao.getVmwareDcName(srcClusterId);
                         final String destDcName = 
_clusterDetailsDao.getVmwareDcName(destClusterId);
                         if (srcDcName != null && destDcName != null && 
!srcDcName.equals(destDcName)) {
                             s_logger.debug("Since VM's storage was 
successfully migrated across VMware Datacenters, unregistering VM: " + 
vm.getInstanceName() +
-                                    " from source host: " + srcHost.getId());
+                                    " from source host: " + srcHostId);
                             final UnregisterVMCommand uvc = new 
UnregisterVMCommand(vm.getInstanceName());
                             uvc.setCleanupVmFiles(true);
                             try {
-                                _agentMgr.send(srcHost.getId(), uvc);
-                            } catch (final Exception e) {
-                                throw new CloudRuntimeException("Failed to 
unregister VM: " + vm.getInstanceName() + " from source host: " + 
srcHost.getId() +
+                                _agentMgr.send(srcHostId, uvc);
+                            } catch (final AgentUnavailableException | 
OperationTimedoutException e) {
 
 Review comment:
   yay
 
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to