가상머신 마이그레이션 시 migrationIp와 VNC graphics IP 분리 적용

Author: jschoiRR

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

@@ -2918,6 +2918,9 @@ protected MigrateCommand buildMigrateCommand(VMInstanceVO vmInstance, VirtualMac
         String destIp = StringUtils.isNotBlank(destHost.getMigrationIp())
             ? destHost.getMigrationIp()
             : destination.getHost().getPrivateIpAddress();
+        if (StringUtils.isBlank(virtualMachineTO.getVncAddr())) {
+            virtualMachineTO.setVncAddr(destination.getHost().getPrivateIpAddress());
+        }
 
         final boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vmInstance.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
         final MigrateCommand migrateCommand = new MigrateCommand(vmInstance.getInstanceName(), destIp, isWindows, virtualMachineTO,

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

@@ -135,12 +135,9 @@ public Answer execute(final MigrateCommand command, final LibvirtComputingResour
 
             dm = conn.domainLookupByName(vmName);
             /*
-                We replace the private IP address with the address of the destination host.
-                This is because the VNC listens on the private IP address of the hypervisor,
-                but that address is of course different on the target host.
-
-                MigrateCommand.getDestinationIp() returns the private IP address of the target
-                hypervisor. So it's safe to use.
+                We replace the VNC graphics listen address with the VNC address configured for
+                the target host. This is typically the private IP address of the destination
+                hypervisor, but it must remain independent from the migration transport IP.
 
                 The Domain.migrate method from libvirt supports passing a different XML
                 description for the instance to be used on the target host.
@@ -156,6 +153,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
             final int xmlFlag = conn.getLibVirVersion() >= 1000000 ? 8 : 1; // 1000000 equals v1.0.0
 
             final String target = command.getDestinationIp();
+            final String vncTarget = StringUtils.defaultIfBlank(to.getVncAddr(), target);
             xmlDesc = dm.getXMLDesc(xmlFlag);
             if (logger.isDebugEnabled()) {
                 logger.debug(String.format("VM [%s] with XML configuration [%s] will be migrated to host [%s].", vmName, xmlDesc, target));
@@ -164,7 +162,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
             // Limit the VNC password in case the length is greater than 8 characters
             // Since libvirt version 8 VNC passwords are limited to 8 characters
             String vncPassword = org.apache.commons.lang3.StringUtils.truncate(to.getVncPassword(), 8);
-            xmlDesc = replaceIpForVNCInDescFileAndNormalizePassword(xmlDesc, target, vncPassword, vmName);
+            xmlDesc = replaceIpForVNCInDescFileAndNormalizePassword(xmlDesc, vncTarget, vncPassword, vmName);
 
             // Replace Config Drive ISO path
             String oldIsoVolumePath = getOldVolumePath(disks, vmName);