From fcfd4e9e33fd351998e495a296bbb4244d66d4f7 Mon Sep 17 00:00:00 2001 From: kishan Date: Thu, 3 Feb 2011 16:38:48 +0530 Subject: [PATCH] bug 8192: use volume size in bytes for usage status 8192: resolved fixed --- server/src/com/cloud/storage/StorageManagerImpl.java | 9 +++------ server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 96a1938bd7d..da9b31e15d7 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -518,7 +518,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag Long templateId = originalVolume.getTemplateId(); ; Long diskOfferingId = originalVolume.getDiskOfferingId(); - long sizeMB = createdVolume.getSize() / (1024 * 1024); if (createdVolume.getPath() != null) { Long offeringId = null; @@ -530,7 +529,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), - volume.getId(), volume.getName(), offeringId, templateId, sizeMB); + volume.getId(), volume.getName(), offeringId, templateId, createdVolume.getSize()); _usageEventDao.persist(usageEvent); } txn.commit(); @@ -2275,10 +2274,9 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag // Save usage event and update resource count for user vm volumes if (vm instanceof UserVm) { - long sizeMB = size / (1024 * 1024); UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), - vol.getName(), offering.getId(), null, sizeMB); + vol.getName(), offering.getId(), null, size); _usageEventDao.persist(usageEvent); _accountMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume); @@ -2321,7 +2319,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag // Create event and update resource count for volumes if vm is a user vm if (vm instanceof UserVm) { - long sizeMB = vol.getSize() / (1024 * 1024); Long offeringId = null; @@ -2330,7 +2327,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), - vol.getName(), offeringId, template.getId(), sizeMB); + vol.getName(), offeringId, template.getId(), vol.getSize()); _usageEventDao.persist(usageEvent); _accountMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume); diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 3f04facace7..c5d4a8dfaec 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1030,7 +1030,6 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager // Create an event Long templateId = volume.getTemplateId(); Long diskOfferingId = volume.getDiskOfferingId(); - long sizeMB = volume.getSize()/(1024*1024); Long offeringId = null; if(diskOfferingId != null){ DiskOfferingVO offering = _diskOfferingDao.findById(diskOfferingId); @@ -1038,7 +1037,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager offeringId = offering.getId(); } } - UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), offeringId, templateId , sizeMB); + UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), offeringId, templateId , volume.getSize()); _usageEventDao.persist(usageEvent); }