etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More changes for Bug 9387: 

- Update system vm_instance's template_id if it does not match the system vm template.
- Use _templateDao.findSystemVMTemplate to find the latest system vm template.
This commit is contained in:
prachi 2011-04-12 17:59:12 -07:00
parent 47f43df01b
commit 80fe0b584d
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/vm/VMInstanceVO.java
View File

@ -80,7 +80,7 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
@Column(name="instance_name", updatable=true, nullable=false)
protected String instanceName;
@Column(name="vm_template_id", updatable=false, nullable=true, length=17)
@Column(name="vm_template_id", updatable=true, nullable=true, length=17)
protected Long templateId = new Long(-1);
@Column(name="guest_os_id", nullable=false, length=17)

33
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -556,6 +556,22 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
T startedVm = null;
ServiceOfferingVO offering = _offeringDao.findById(vm.getServiceOfferingId());
VMTemplateVO template = _templateDao.findById(vm.getTemplateId());
//if System VM template has been changed, update vm templateId if this is a System VM
if(VirtualMachine.Type.DomainRouter.equals(vm.getType())
|| VirtualMachine.Type.ConsoleProxy.equals(vm.getType())
|| VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())){
VMTemplateVO systemVMTemplate = _templateDao.findSystemVMTemplate(vm.getDataCenterId(), vm.getHypervisorType());
if(template != null && systemVMTemplate != null){
if(template.getId() != systemVMTemplate.getId()){
if (s_logger.isDebugEnabled()) {
s_logger.debug("System VM's templateId does not match the current System VM Template, updating templateId of the VM: "+ vm);
}
vm.setTemplateId(systemVMTemplate.getId());
_vmDao.update(vm.getId(), vm);
}
}
}
Long clusterSpecified = null;
if(hostIdSpecified != null){
Host destinationHost = _hostDao.findById(hostIdSpecified);
@ -584,13 +600,16 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
|| VirtualMachine.Type.SecondaryStorageVm.equals(vm.getType())){
Long volTemplateId = vol.getTemplateId();
if(volTemplateId != null && volTemplateId.longValue() != vm.getTemplateId()){
if (s_logger.isDebugEnabled()) {
s_logger.debug("Root Volume " + vol + " of "+vm.getType().toString() +" System VM is ready, but volume's templateId does not match the VM, updating templateId and reassigning a new pool");
}
vol.setTemplateId(vm.getTemplateId());
_volsDao.update(vol.getId(), vol);
continue;
VMTemplateVO systemVMTemplate = _templateDao.findSystemVMTemplate(vm.getDataCenterId(), vm.getHypervisorType());
if(volTemplateId != null && systemVMTemplate != null){
if(volTemplateId.longValue() != systemVMTemplate.getId()){
if (s_logger.isDebugEnabled()) {
s_logger.debug("Root Volume " + vol + " of "+vm.getType().toString() +" System VM is ready, but volume's templateId does not match the System VM Template, updating templateId and reassigning a new pool");
}
vol.setTemplateId(systemVMTemplate.getId());
_volsDao.update(vol.getId(), vol);
continue;
}
}
}