Skip to content

Commit 8758799

Browse files
KVM: also mark SystemVM templates registered before the upgrade as dynamically scalable
An operator can register the new SystemVM template by hand before upgrading. The upgrade SQL runs while it is still a user template, so it does not set the flag. Set it when such a KVM template is turned into a SystemVM template. Templates that already are SystemVM templates keep their flag, so a later upgrade does not undo an operator's choice.
1 parent 4ea5d5b commit 8758799

2 files changed

Lines changed: 40 additions & 0 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,13 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
10581058
protected void updateRegisteredTemplateDetails(Long templateId, MetadataTemplateDetails templateDetails,
10591059
Long zoneId) {
10601060
VMTemplateVO templateVO = vmTemplateDao.findById(templateId);
1061+
// A KVM template registered by hand before the upgrade becomes a SystemVM template only here, after the
1062+
// upgrade SQL has marked the existing KVM SystemVM templates as dynamically scalable. Templates that are
1063+
// already SystemVM templates keep their flag, so an operator who turned it off keeps it off.
1064+
if (!Storage.TemplateType.SYSTEM.equals(templateVO.getTemplateType())
1065+
&& Hypervisor.HypervisorType.KVM.equals(templateDetails.getHypervisorType())) {
1066+
templateVO.setDynamicallyScalable(true);
1067+
}
10611068
templateVO.setTemplateType(Storage.TemplateType.SYSTEM);
10621069
GuestOSVO guestOS = guestOSDao.findOneByDisplayName(templateDetails.getGuestOs());
10631070
if (guestOS != null) {

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,4 +1694,37 @@ private VMTemplateVO createTemplateObject(Hypervisor.HypervisorType hypervisorTy
16941694
when(vmTemplateDao.persist(any(VMTemplateVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
16951695
return systemVmTemplateRegistration.createTemplateObjectInDB(details);
16961696
}
1697+
1698+
@Test
1699+
public void updateRegisteredTemplateDetails_PreRegisteredKvmTemplateBecomesDynamicallyScalable() {
1700+
VMTemplateVO template = updateRegisteredTemplate(Storage.TemplateType.USER, Hypervisor.HypervisorType.KVM);
1701+
assertEquals(Storage.TemplateType.SYSTEM, template.getTemplateType());
1702+
assertTrue(template.isDynamicallyScalable());
1703+
}
1704+
1705+
@Test
1706+
public void updateRegisteredTemplateDetails_KvmSystemTemplateKeepsItsFlag() {
1707+
assertFalse(updateRegisteredTemplate(Storage.TemplateType.SYSTEM, Hypervisor.HypervisorType.KVM).isDynamicallyScalable());
1708+
}
1709+
1710+
@Test
1711+
public void updateRegisteredTemplateDetails_PreRegisteredOtherHypervisorTemplateIsNotDynamicallyScalable() {
1712+
assertFalse(updateRegisteredTemplate(Storage.TemplateType.USER, Hypervisor.HypervisorType.VMware).isDynamicallyScalable());
1713+
}
1714+
1715+
private VMTemplateVO updateRegisteredTemplate(Storage.TemplateType currentType, Hypervisor.HypervisorType hypervisorType) {
1716+
long templateId = 1L;
1717+
VMTemplateVO template = new VMTemplateVO();
1718+
template.setTemplateType(currentType);
1719+
template.setDynamicallyScalable(false);
1720+
SystemVmTemplateRegistration.MetadataTemplateDetails templateDetails =
1721+
Mockito.mock(SystemVmTemplateRegistration.MetadataTemplateDetails.class);
1722+
when(templateDetails.getHypervisorType()).thenReturn(hypervisorType);
1723+
when(vmTemplateDao.findById(templateId)).thenReturn(template);
1724+
when(vmTemplateDao.update(template.getId(), template)).thenReturn(true);
1725+
doNothing().when(systemVmTemplateRegistration).updateSystemVMEntries(templateId, hypervisorType);
1726+
doNothing().when(systemVmTemplateRegistration).updateConfigurationParams(any(), any(), any());
1727+
systemVmTemplateRegistration.updateRegisteredTemplateDetails(templateId, templateDetails, null);
1728+
return template;
1729+
}
16971730
}

0 commit comments

Comments
 (0)