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

bug 7504: Add usage events for VM destroy and stop during account delete

This commit is contained in:
kishan 2010-12-22 20:26:34 +05:30
parent 2d7979ec88
commit 9837cba9f1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,6 +1109,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
if (!destroy(vm)) {
return false;
}
UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getName(), vm.getServiceOfferingId(), vm.getTemplateId(), null);
_usageEventDao.persist(usageEvent);
cleanNetworkRules(userId, vmId);
// Mark the VM's disks as destroyed
@ -1388,6 +1390,9 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
}
_eventDao.persist(event);
UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VM_STOP, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getName(), vm.getServiceOfferingId(), vm.getTemplateId(), null);
_usageEventDao.persist(usageEvent);
if (_storageMgr.unshare(vm, null) == null) {
s_logger.warn("Unable to set share to false for " + vm.toString());
}