Merge pull request #684 from jschoiRR/mold-main#2025

jschoiRR · web-flow · commit e3bc6a2e4672 · 2025-09-18T16:00:33.000+09:00
[Mold API, UI] 가상머신 라이브 마이그레이션 전용 IP 설정 및 기능 개발
diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
@@ -1312,6 +1312,8 @@ public class ApiConstants {
 
     public static final String RESULT_REDFISH_DATA = "redfishdata";
     public static final String EXTERNAL_ENTITY = "externalEntity";
+    public static final String MIGRATION_IP = "migrationip";
+
 
     /**
      * This enum specifies IO Drivers, each option controls specific policies on I/O.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -67,6 +67,9 @@ public class UpdateHostCmd extends BaseCmd {
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "Add an annotation to this host", since = "4.11", authorized = {RoleType.Admin})
     private String annotation;
 
+    @Parameter(name = ApiConstants.MIGRATION_IP, type = CommandType.STRING, description = "Add an migration ip to this host", since = "4.20")
+    private String migrationIp;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -103,6 +106,10 @@ public String getAnnotation() {
         return annotation;
     }
 
+    public String getMigrationIp() {
+        return migrationIp;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
@@ -298,6 +298,18 @@ public class HostResponse extends BaseResponseWithAnnotations {
     @Param(description = "CPU Arch of the host", since = "4.20")
     private String arch;
 
+    @SerializedName(ApiConstants.MIGRATION_IP)
+    @Param(description = "Live Migration Ip of the host", since = "4.21")
+    private String migrationIp;
+
+    public String getMigrationIp() {
+        return migrationIp;
+    }
+
+    public void setMigrationIp(String migrationIp) {
+        this.migrationIp = migrationIp;
+    }
+
     @Override
     public String getObjectId() {
         return this.getId();
diff --git a/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java b/engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java
@@ -53,6 +53,11 @@ public interface ResourceManager extends ResourceService, Configurable {
             "Number of retries when preparing a host into Maintenance Mode is faulty before failing",
             false);
 
+    ConfigKey<String> KvmSshPort = new ConfigKey<>("Advanced", String.class,
+            "kvm.ssh.port","22",
+            "Kvm Host agent port value",
+            false);
+
     ConfigKey<String> HOST_MAINTENANCE_LOCAL_STRATEGY = new ConfigKey<>(String.class,
     "host.maintenance.local.storage.strategy", "Advanced","Error",
             "Defines the strategy towards VMs with volumes on local storage when putting a host in maintenance. "
diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2914,8 +2914,13 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
      */
     protected MigrateCommand buildMigrateCommand(VMInstanceVO vmInstance, VirtualMachineTO virtualMachineTO, DeployDestination destination, Answer answer,
                                                  Map<String, DpdkTO> dpdkInterfaceMapping) {
+        final HostVO destHost = _hostDao.findById(destination.getHost().getId());
+        String destIp = StringUtils.isNotBlank(destHost.getMigrationIp())
+            ? destHost.getMigrationIp()
+            : destination.getHost().getPrivateIpAddress();
+
         final boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vmInstance.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
-        final MigrateCommand migrateCommand = new MigrateCommand(vmInstance.getInstanceName(), destination.getHost().getPrivateIpAddress(), isWindows, virtualMachineTO,
+        final MigrateCommand migrateCommand = new MigrateCommand(vmInstance.getInstanceName(), destIp, isWindows, virtualMachineTO,
                 getExecuteInSequence(vmInstance.getHypervisorType()));
 
         Map<String, Boolean> vlanToPersistenceMap = getVlanToPersistenceMapForVM(vmInstance.getId());
diff --git a/engine/schema/src/main/java/com/cloud/host/HostVO.java b/engine/schema/src/main/java/com/cloud/host/HostVO.java
@@ -410,6 +410,9 @@ public void setGpuGroups(HashMap<String, HashMap<String, VgpuTypesInfo>> groupDe
     @Column(name = "version")
     private String version;
 
+    @Column(name = "migration_ip")
+    private String migrationIp;
+
     @Column(name = GenericDao.CREATED_COLUMN)
     private Date created;
 
@@ -570,6 +573,14 @@ public void setManagementServerId(Long managementServerId) {
         this.managementServerId = managementServerId;
     }
 
+    public void setMigrationIp(String migrationIp) {
+        this.migrationIp = migrationIp;
+    }
+
+    public String getMigrationIp() {
+        return migrationIp;
+    }
+
     @Override
     public long getLastPinged() {
         return lastPinged;
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-Diplo-After.sql b/engine/schema/src/main/resources/META-INF/db/schema-Diplo-After.sql
@@ -47,4 +47,6 @@ INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (17, 6246);
 INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (18, 6247);
 INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (19, 6248);
 INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (20, 6249);
-INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (21, 6250);
+INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (21, 6250);
+
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'migration_ip', 'VARCHAR(45)');
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql
@@ -42,6 +42,7 @@ SELECT
     host.speed,
     host.ram,
     host.arch,
+    host.migration_ip,
     cluster.id cluster_id,
     cluster.uuid cluster_uuid,
     cluster.name cluster_name,
diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
@@ -144,6 +144,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
         hostResponse.setIpAddress(host.getPrivateIpAddress());
         hostResponse.setVersion(host.getVersion());
         hostResponse.setCreated(host.getCreated());
+        hostResponse.setMigrationIp(host.getMigrationIp());
 
         List<HostGpuGroupsVO> gpuGroups = ApiDBUtils.getGpuGroups(host.getId());
         if (gpuGroups != null && !gpuGroups.isEmpty()) {
diff --git a/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/HostJoinVO.java
@@ -219,6 +219,9 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity
     @Convert(converter = CPUArchConverter.class)
     private CPU.CPUArch arch;
 
+    @Column(name = "migration_ip")
+    private String migrationIp;
+
     @Override
     public long getId() {
         return this.id;
@@ -442,4 +445,8 @@ public boolean isInMaintenanceStates() {
     public CPU.CPUArch getArch() {
         return arch;
     }
+
+    public String getMigrationIp() {
+        return migrationIp;
+    }
 }
diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -43,6 +43,7 @@
 import com.cloud.resource.ResourceStateAdapter;
 import com.cloud.resource.ServerResource;
 import com.cloud.resource.UnableDeleteHostException;
+import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.PasswordGenerator;
 import com.cloud.utils.StringUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -257,7 +258,8 @@ private void setupAgentSecurity(final Connection sshConnection, final String age
                 }
             }
 
-            sshConnection = new Connection(agentIp, 22);
+            int port = NumbersUtil.parseInt(_configDao.getValue("kvm.ssh.port"), 22);
+            sshConnection = new Connection(agentIp, port);
 
             sshConnection.connect(null, 60000, 60000);
 
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -1907,6 +1907,13 @@ private void updateHostName(HostVO host, String name) {
         _hostDao.update(host.getId(), host);
     }
 
+
+    private void updateMigratinIp(HostVO host, String migrationIp) {
+        logger.debug("Updating Host use live migataion use ip address to: " + migrationIp);
+        host.setMigrationIp(migrationIp);
+        _hostDao.update(host.getId(), host);
+    }
+
     private void updateHostGuestOSCategory(Long hostId, Long guestOSCategoryId) {
         // Verify that the guest OS Category exists
         if (!(guestOSCategoryId > 0) || _guestOSCategoryDao.findById(guestOSCategoryId) == null) {
@@ -1948,7 +1955,51 @@ private void updateHostTags(HostVO host, Long hostId, List<String> hostTags, Boo
     @Override
     public Host updateHost(final UpdateHostCmd cmd) throws NoTransitionException {
         return updateHost(cmd.getId(), cmd.getName(), cmd.getOsCategoryId(),
-                cmd.getAllocationState(), cmd.getUrl(), cmd.getHostTags(), cmd.getIsTagARule(), cmd.getAnnotation(), false);
+                cmd.getAllocationState(), cmd.getUrl(), cmd.getHostTags(), cmd.getIsTagARule(), cmd.getAnnotation(), false, cmd.getMigrationIp());
+    }
+
+    private Host updateHost(Long hostId, String name, Long guestOSCategoryId, String allocationState,
+                            String url, List<String> hostTags, Boolean isTagARule, String annotation, boolean isUpdateFromHostHealthCheck, String migrationIp) throws NoTransitionException {
+        // Verify that the host exists
+        final HostVO host = _hostDao.findById(hostId);
+        if (host == null) {
+            throw new InvalidParameterValueException("Host with id " + hostId + " doesn't exist");
+        }
+
+        boolean isUpdateHostAllocation = false;
+        if (StringUtils.isNotBlank(allocationState)) {
+            isUpdateHostAllocation = updateHostAllocationState(host, allocationState, isUpdateFromHostHealthCheck);
+        }
+
+        if (StringUtils.isNotBlank(name)) {
+            updateHostName(host, name);
+        }
+
+        if (guestOSCategoryId != null) {
+            updateHostGuestOSCategory(hostId, guestOSCategoryId);
+        }
+
+        if (hostTags != null) {
+            updateHostTags(host, hostId, hostTags, isTagARule);
+        }
+
+        updateMigratinIp(host, migrationIp);
+
+        if (url != null) {
+            _storageMgr.updateSecondaryStorage(hostId, url);
+        }
+        try {
+            _storageMgr.enableHost(hostId);
+        } catch (StorageUnavailableException | StorageConflictException e) {
+            logger.error(String.format("Failed to setup host %s when enabled", host));
+        }
+
+        final HostVO updatedHost = _hostDao.findById(hostId);
+
+        sendAlertAndAnnotationForAutoEnableDisableKVMHostFeature(host, allocationState,
+                isUpdateFromHostHealthCheck, isUpdateHostAllocation, annotation);
+
+        return updatedHost;
     }
 
     private Host updateHost(Long hostId, String name, Long guestOSCategoryId, String allocationState,
@@ -3593,6 +3644,6 @@ public String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {KvmSshToAgentEnabled, HOST_MAINTENANCE_LOCAL_STRATEGY};
+        return new ConfigKey<?>[] {KvmSshToAgentEnabled, KvmSshPort, HOST_MAINTENANCE_LOCAL_STRATEGY};
     }
 }
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -4878,5 +4878,6 @@
 "label.hardware.storage.enclosurelist": "Enclosures",
 "label.switches": "Switches",
 "message.redfishdata.loading": "Query may take some time.",
-"message.migrate.instance.to.host.extraconfig" : "<br>(The virtual machine is using host devices (ExtraConfig) and live migration may fail. Do you want to proceed anyway?)"
+"message.migrate.instance.to.host.extraconfig" : "<br>(The virtual machine is using host devices (ExtraConfig) and live migration may fail. Do you want to proceed anyway?)",
+"label.migrationip": "Live Migration IP Address"
 }
diff --git a/ui/public/locales/ko_KR.json b/ui/public/locales/ko_KR.json
diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
diff --git a/ui/src/config/section/infra/hosts.js b/ui/src/config/section/infra/hosts.js
diff --git a/ui/src/views/infra/HostUpdate.vue b/ui/src/views/infra/HostUpdate.vue
