apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8192: use volume size in bytes for usage

Browse Source 
status 8192: resolved fixed
This commit is contained in:
kishan 2011-02-03 16:38:48 +05:30
parent 16f1a3a548
commit fcfd4e9e33
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -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);

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -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);
}