Skip to content

Commit 0d88e2a

Browse files
jschoiRRjschoiRR
authored
Merge branch 'ablestack-diplo' into mold-europa
2 parents 4d448da + e3bc6a2 commit 0d88e2a

File tree

24 files changed

+266
-49
lines changed

24 files changed

+266
-49
lines changed

‎api/src/main/java/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,7 @@ public class ApiConstants {
13741374

13751375
public static final String RESULT_REDFISH_DATA = "redfishdata";
13761376
public static final String EXTERNAL_ENTITY = "externalEntity";
1377+
public static final String MIGRATION_IP = "migrationip";
13771378

13781379
/**
13791380
* This enum specifies IO Drivers, each option controls specific policies on I/O.

‎api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public class UpdateHostCmd extends BaseCmd {
6767
@Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "Add an annotation to this host", since = "4.11", authorized = {RoleType.Admin})
6868
private String annotation;
6969

70+
@Parameter(name = ApiConstants.MIGRATION_IP, type = CommandType.STRING, description = "Add an migration ip to this host", since = "4.20")
71+
private String migrationIp;
72+
7073
/////////////////////////////////////////////////////
7174
/////////////////// Accessors ///////////////////////
7275
/////////////////////////////////////////////////////
@@ -103,6 +106,10 @@ public String getAnnotation() {
103106
return annotation;
104107
}
105108

109+
public String getMigrationIp() {
110+
return migrationIp;
111+
}
112+
106113
/////////////////////////////////////////////////////
107114
/////////////// API Implementation///////////////////
108115
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,18 @@ public class HostResponse extends BaseResponseWithAnnotations {
322322
@Param(description = "comma-separated list of storage access groups on the zone", since = "4.21.0")
323323
private String zoneStorageAccessGroups;
324324

325+
@SerializedName(ApiConstants.MIGRATION_IP)
326+
@Param(description = "Live Migration Ip of the host", since = "4.21")
327+
private String migrationIp;
328+
329+
public String getMigrationIp() {
330+
return migrationIp;
331+
}
332+
333+
public void setMigrationIp(String migrationIp) {
334+
this.migrationIp = migrationIp;
335+
}
336+
325337
@Override
326338
public String getObjectId() {
327339
return this.getId();

‎engine/components-api/src/main/java/com/cloud/resource/ResourceManager.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ public interface ResourceManager extends ResourceService, Configurable {
5656
"Number of retries when preparing a host into Maintenance Mode is faulty before failing",
5757
false);
5858

59+
ConfigKey<String> KvmSshPort = new ConfigKey<>("Advanced", String.class,
60+
"kvm.ssh.port","22",
61+
"Kvm Host agent port value",
62+
false);
63+
5964
ConfigKey<String> HOST_MAINTENANCE_LOCAL_STRATEGY = new ConfigKey<>(String.class,
6065
"host.maintenance.local.storage.strategy", "Advanced","Error",
6166
"Defines the strategy towards VMs with volumes on local storage when putting a host in maintenance. "

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2970,8 +2970,13 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
29702970
*/
29712971
protected MigrateCommand buildMigrateCommand(VMInstanceVO vmInstance, VirtualMachineTO virtualMachineTO, DeployDestination destination, Answer answer,
29722972
Map<String, DpdkTO> dpdkInterfaceMapping) {
2973+
final HostVO destHost = _hostDao.findById(destination.getHost().getId());
2974+
String destIp = StringUtils.isNotBlank(destHost.getMigrationIp())
2975+
? destHost.getMigrationIp()
2976+
: destination.getHost().getPrivateIpAddress();
2977+
29732978
final boolean isWindows = _guestOsCategoryDao.findById(_guestOsDao.findById(vmInstance.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
2974-
final MigrateCommand migrateCommand = new MigrateCommand(vmInstance.getInstanceName(), destination.getHost().getPrivateIpAddress(), isWindows, virtualMachineTO,
2979+
final MigrateCommand migrateCommand = new MigrateCommand(vmInstance.getInstanceName(), destIp, isWindows, virtualMachineTO,
29752980
getExecuteInSequence(vmInstance.getHypervisorType()));
29762981

29772982
Map<String, Boolean> vlanToPersistenceMap = getVlanToPersistenceMapForVM(vmInstance.getId());

‎engine/schema/src/main/java/com/cloud/host/HostVO.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,9 @@ public void setGpuGroups(HashMap<String, HashMap<String, VgpuTypesInfo>> groupDe
425425
@Column(name = "version")
426426
private String version;
427427

428+
@Column(name = "migration_ip")
429+
private String migrationIp;
430+
428431
@Column(name = GenericDao.CREATED_COLUMN)
429432
private Date created;
430433

@@ -589,6 +592,14 @@ public void setLastManagementServerId(Long lastManagementServerId) {
589592
this.lastManagementServerId = lastManagementServerId;
590593
}
591594

595+
public void setMigrationIp(String migrationIp) {
596+
this.migrationIp = migrationIp;
597+
}
598+
599+
public String getMigrationIp() {
600+
return migrationIp;
601+
}
602+
592603
@Override
593604
public long getLastPinged() {
594605
return lastPinged;

‎engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java‎

Lines changed: 88 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -451,23 +451,26 @@ public void check() {
451451
try {
452452
initializeDatabaseEncryptors();
453453

454-
// DB version 테이블의 latest 행 삭제
455-
final CloudStackVersion dbVersionInitial = CloudStackVersion.parse(_dao.getCurrentVersion());
456-
deleteCurrentVersionRowIfPresent(dbVersionInitial);
457-
454+
// 1) 코드(설치될) 버전 먼저 파싱
458455
final String currentVersionValue = this.getClass().getPackage().getImplementationVersion();
459456
if (StringUtils.isBlank(currentVersionValue)) return;
460457
final CloudStackVersion currentVersion = CloudStackVersion.parse(currentVersionValue);
461458

459+
// 2) DB 최신 버전 읽기
460+
final CloudStackVersion dbLatestVersion = CloudStackVersion.parse(_dao.getCurrentVersion());
461+
462+
// 3) 베이스라인 보장 + (db==code) 같으면 삭제 스킵
463+
enforceBaselineThenDeleteLastVersionIfNeeded(dbLatestVersion, currentVersion);
464+
462465
///////////////////// Ablestack 업그레이드 //////////////////////////
463466
beforeUpgradeAblestack("Bronto");
464467
beforeUpgradeAblestack("Cerato");
465468
beforeUpgradeAblestack("Diplo");
466469
///////////////////// Ablestack 업그레이드 //////////////////////////
467470

468-
// 삭제 후 DB 버전 재조회
471+
// 4) 재조회 후 본 업그레이드 진행
469472
final CloudStackVersion dbVersion = CloudStackVersion.parse(_dao.getCurrentVersion());
470-
LOGGER.info("After deletion, DB version = {} , Code version = {}", dbVersion, currentVersion);
473+
LOGGER.info("After enforcement, DB version = {} , Code version = {}", dbVersion, currentVersion);
471474

472475
String csVersion = SystemVmTemplateRegistration.parseMetadataFile();
473476
final CloudStackVersion sysVmVersion = CloudStackVersion.parse(csVersion);
@@ -495,6 +498,85 @@ public void check() {
495498
}
496499
}
497500

501+
private void enforceBaselineThenDeleteLastVersionIfNeeded(final CloudStackVersion dbLatestVersion,
502+
final CloudStackVersion currentVersion) {
503+
final String BASELINE_VERSION = "4.0.0";
504+
final TransactionLegacy txn = TransactionLegacy.open("enforce-baseline-then-delete-last");
505+
txn.start();
506+
try {
507+
final Connection conn = txn.getConnection();
508+
509+
// 0) DB 최신버전 == 코드버전이면 삭제/삽입 모두 스킵
510+
final boolean sameAsCode = (dbLatestVersion != null
511+
&& currentVersion != null
512+
&& dbLatestVersion.compareTo(currentVersion) == 0);
513+
if (sameAsCode) {
514+
LOGGER.info("DB latest version equals code version (db={}, code={}). Skipping baseline insert and deletion.",
515+
dbLatestVersion, currentVersion);
516+
txn.commit();
517+
return;
518+
}
519+
520+
// 1) sameAsCode == false 인 경우에만 베이스라인 보장 (없으면 삽입)
521+
final String insertIfMissingSql =
522+
"INSERT INTO `cloud`.`version` (`version`, `step`, `updated`) " +
523+
"SELECT ?, 'Complete', NOW() FROM DUAL " +
524+
"WHERE NOT EXISTS (SELECT 1 FROM `cloud`.`version` WHERE `version` = ?)";
525+
try (PreparedStatement ins = conn.prepareStatement(insertIfMissingSql)) {
526+
ins.setString(1, BASELINE_VERSION);
527+
ins.setString(2, BASELINE_VERSION);
528+
int inserted = ins.executeUpdate();
529+
if (inserted > 0) {
530+
LOGGER.info("Inserted baseline version row: {}", BASELINE_VERSION);
531+
txn.commit();
532+
return; // 여기서 종료
533+
}
534+
}
535+
536+
// 2) 삭제 대상: dbLatestVersion 의 최신 1건 (단, 베이스라인이면 삭제 금지)
537+
if (dbLatestVersion != null
538+
&& currentVersion != null
539+
&& dbLatestVersion.compareTo(currentVersion) != 0
540+
&& !BASELINE_VERSION.equals(dbLatestVersion.toString())) {
541+
542+
final String deleteLatestOneSql =
543+
"DELETE FROM `cloud`.`version` " +
544+
"WHERE `id` IN ( " +
545+
" SELECT id FROM ( " +
546+
" SELECT `id` " +
547+
" FROM `cloud`.`version` " +
548+
" WHERE `version` = ? AND (`step` IS NULL OR `step` = 'Complete') " +
549+
" ORDER BY COALESCE(`updated`, FROM_UNIXTIME(0)) DESC " +
550+
" LIMIT 1 " +
551+
" ) AS _x " +
552+
")";
553+
try (PreparedStatement delLatest = conn.prepareStatement(deleteLatestOneSql)) {
554+
delLatest.setString(1, dbLatestVersion.toString());
555+
int deleted = delLatest.executeUpdate();
556+
if (deleted > 0) {
557+
LOGGER.warn("Deleted {} latest row for version {}", deleted, dbLatestVersion.toString());
558+
txn.commit();
559+
return;
560+
} else {
561+
LOGGER.info("No deletable row found for targetVersion={}; skipping targeted delete.",
562+
dbLatestVersion.toString());
563+
}
564+
}
565+
} else {
566+
// null-safe 로깅
567+
LOGGER.info("Target version is baseline or null ({}). Skipping targeted delete.",
568+
String.valueOf(dbLatestVersion));
569+
}
570+
571+
txn.commit();
572+
} catch (SQLException e) {
573+
txn.rollback();
574+
LOGGER.error("Failed in enforceBaselineThenDeleteLastVersionIfNeeded", e);
575+
} finally {
576+
txn.close();
577+
}
578+
}
579+
498580
// Cloudstack DB 업데이트 전 Ablestack DB 업데이트 진행
499581
public void beforeUpgradeAblestack (String ablestackVersion) {
500582
TransactionLegacy txn = TransactionLegacy.open("Upgrade");
@@ -530,27 +612,6 @@ public void beforeUpgradeAblestack (String ablestackVersion) {
530612
}
531613
}
532614

533-
private void deleteCurrentVersionRowIfPresent(final CloudStackVersion currentVersion) {
534-
TransactionLegacy txn = TransactionLegacy.open("delete-current-version-row");
535-
txn.start();
536-
try {
537-
Connection conn = txn.getConnection();
538-
try (PreparedStatement ps = conn.prepareStatement(
539-
"DELETE FROM `cloud`.`version` WHERE `version` = ? AND (`step` IS NULL OR `step` = 'Complete')")) {
540-
ps.setString(1, currentVersion.toString());
541-
int deleted = ps.executeUpdate();
542-
LOGGER.warn("Deleted {} row(s) from cloud.version for {}", deleted, currentVersion);
543-
}
544-
txn.commit();
545-
} catch (SQLException e) {
546-
txn.rollback();
547-
LOGGER.error("Unable to delete current version row", e);
548-
throw new CloudRuntimeException("Unable to delete current version row", e);
549-
} finally {
550-
txn.close();
551-
}
552-
}
553-
554615
// Cloudstack DB 업데이트 후 Ablestack DB 업데이트 진행
555616
public void afterUpgradeAblestack (String ablestackVersion) {
556617
TransactionLegacy txn = TransactionLegacy.open("Upgrade");

‎engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CALL `cloud`.`ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` (1, 'Red Hat Enterprise Linux
4343
CALL `cloud`.`ADD_GUEST_OS_AND_HYPERVISOR_MAPPING` (1, 'Rocky Linux 9', 'VMware', '7.0.3.0', 'otherLinux64Guest');
4444

4545
-- Add support for VMware 8.0 and 8.0a (8.0.0.1)
46-
`cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0', 1024, 0, 59, 64, 1, 1);
46+
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0', 1024, 0, 59, 64, 1, 1);
4747
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.0.1', 1024, 0, 59, 64, 1, 1);
4848
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '8.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0.3.0';
4949
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '8.0.0.1', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0.3.0';
@@ -257,11 +257,11 @@ WHERE n.`state` = 'Setup'
257257
AND n.`removed` IS NULL
258258
AND n.`guest_type` = 'Isolated'
259259
AND o.`is_persistent` = 1
260-
AND m.network_offering_id IS NULL; -- 서비스 매핑이 한 건도 없는 오퍼링만
260+
AND m.network_offering_id IS NULL;
261261

262262
----- PR Quota custom tariffs #5909---
263263
-- Create column 'uuid'
264-
CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.quota_tariff','uuid','VARCHAR(40) DEFAULT NULL');
264+
CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.quota_tariff','uuid','VARCHAR(40)');
265265

266266
UPDATE `cloud_usage`.`quota_tariff`
267267
SET `uuid` = UUID()

‎engine/schema/src/main/resources/META-INF/db/schema-Diplo-After.sql‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (17, 6246);
4747
INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (18, 6247);
4848
INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (19, 6248);
4949
INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (20, 6249);
50-
INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (21, 6250);
50+
INSERT IGNORE INTO `cloud`.`vbmc_port` (id, port) VALUES (21, 6250);
51+
52+
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'migration_ip', 'VARCHAR(45)');

‎engine/schema/src/main/resources/META-INF/db/views/cloud.host_view.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ SELECT
4343
host.ram,
4444
host.arch,
4545
host.storage_access_groups,
46+
host.migration_ip,
4647
cluster.id cluster_id,
4748
cluster.uuid cluster_uuid,
4849
cluster.name cluster_name,

0 commit comments

Comments
 (0)