CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14f1b96b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14f1b96b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14f1b96b Branch: refs/heads/master Commit: 14f1b96b5122696df58751a2045c333989ab8392 Parents: 2284a95 Author: Harikrishna Patnala <harikrishna.patn...@citrix.com> Authored: Mon Apr 21 15:19:30 2014 +0530 Committer: Kishan Kavala <kis...@cloud.com> Committed: Mon May 5 11:50:48 2014 +0530 ---------------------------------------------------------------------- usage/src/com/cloud/usage/UsageManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14f1b96b/usage/src/com/cloud/usage/UsageManagerImpl.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java index 6ce6901..4ceecbb 100644 --- a/usage/src/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/com/cloud/usage/UsageManagerImpl.java @@ -1205,16 +1205,22 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna UsageEventDetailsVO cpuNumber = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuNumber.name()); if (cpuNumber != null) { usageInstance.setCpuCores(Long.parseLong(cpuNumber.getValue())); + } else { + usageInstance.setCpuCores(null); } UsageEventDetailsVO cpuSpeed = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.cpuSpeed.name()); if (cpuSpeed != null) { usageInstance.setCpuSpeed(Long.parseLong(cpuSpeed.getValue())); + } else { + usageInstance.setCpuSpeed(null); } UsageEventDetailsVO memory = _usageEventDetailsDao.findDetail(eventId, UsageEventVO.DynamicParameters.memory.name()); if (memory != null) { usageInstance.setMemory(Long.parseLong(memory.getValue())); + } else { + usageInstance.setMemory(null); } _usageInstanceDao.persist(usageInstance); }
