Skip to content

Commit 4ea5d5b

Browse files
KVM: register SystemVM templates as dynamically scalable
CKS nodes use the KVM SystemVM template by default and inherit its dynamic-scaling flag, which was never set, so a running CKS cluster could not be scaled to a new offering. Set the flag when a KVM SystemVM template is registered, and on upgrade for the existing ones. Fixes #14704
1 parent c5bd11a commit 4ea5d5b

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ protected String getSystemVmTemplateVersion() {
590590
return systemVmTemplateVersion;
591591
}
592592

593-
private VMTemplateVO createTemplateObjectInDB(SystemVMTemplateDetails details) {
593+
protected VMTemplateVO createTemplateObjectInDB(SystemVMTemplateDetails details) {
594594
Long templateId = vmTemplateDao.getNextInSequence(Long.class, "id");
595595
VMTemplateVO template = new VMTemplateVO();
596596
template.setUuid(details.getUuid());
@@ -613,6 +613,8 @@ private VMTemplateVO createTemplateObjectInDB(SystemVMTemplateDetails details) {
613613
template.setArch(details.getArch());
614614
template.setState(VirtualMachineTemplate.State.Inactive);
615615
template.setDeployAsIs(false);
616+
// KVM hot-plugs CPU and memory without guest tools; CKS nodes are created from this template.
617+
template.setDynamicallyScalable(Hypervisor.HypervisorType.KVM.equals(details.getHypervisorType()));
616618
template = vmTemplateDao.persist(template);
617619
return template;
618620
}

‎engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,7 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.disk_offering', 'error_policy', 'VAR
271271

272272
-- Rename persisted FlashArray provider name (plugin getName() changed from 'Flash Array' to 'FlashArray')
273273
UPDATE `cloud`.`storage_pool` SET `storage_provider_name` = 'FlashArray' WHERE `storage_provider_name` = 'Flash Array';
274+
275+
-- KVM SystemVM templates are dynamically scalable, so CKS nodes created from them can be scaled live.
276+
-- Existing VMs keep their own flag; only VMs created from now on pick it up.
277+
UPDATE `cloud`.`vm_template` SET `dynamically_scalable` = 1 WHERE `type` = 'SYSTEM' AND `hypervisor_type` = 'KVM' AND `removed` IS NULL;

‎engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,4 +1675,23 @@ public void getSystemVmTemplateVersion_BuildsFromMajorAndTinyVersionAfterCutover
16751675
SystemVmTemplateRegistration.CS_TINY_VERSION = previousTiny;
16761676
}
16771677
}
1678+
1679+
@Test
1680+
public void createTemplateObjectInDB_KvmTemplateIsDynamicallyScalable() {
1681+
assertTrue(createTemplateObject(Hypervisor.HypervisorType.KVM).isDynamicallyScalable());
1682+
}
1683+
1684+
@Test
1685+
public void createTemplateObjectInDB_OtherHypervisorTemplateIsNotDynamicallyScalable() {
1686+
assertFalse(createTemplateObject(Hypervisor.HypervisorType.VMware).isDynamicallyScalable());
1687+
}
1688+
1689+
private VMTemplateVO createTemplateObject(Hypervisor.HypervisorType hypervisorType) {
1690+
SystemVmTemplateRegistration.SystemVMTemplateDetails details = new SystemVmTemplateRegistration.SystemVMTemplateDetails(
1691+
"uuid", "systemvm", new java.sql.Date(System.currentTimeMillis()), "http://localhost/systemvm.qcow2", "d41d8cd98f00b204e9800998ecf8427e",
1692+
Storage.ImageFormat.QCOW2, 1, hypervisorType, CPU.CPUArch.amd64, 1L);
1693+
when(vmTemplateDao.getNextInSequence(Long.class, "id")).thenReturn(1L);
1694+
when(vmTemplateDao.persist(any(VMTemplateVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
1695+
return systemVmTemplateRegistration.createTemplateObjectInDB(details);
1696+
}
16781697
}

0 commit comments

Comments
 (0)