CLOUDSTACK-7018: Restore VM - missing destroyed usage event for the destroyed root volume. Also removed the resource count logic since we destroy the old root volume and create a new one.

nitinmeh · nitinmeh · commit 835ca8eea860 · 2014-08-04T16:40:28.000-07:00
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4732,21 +4732,20 @@ public UserVm restoreVMInternal(Account caller, UserVmVO vm, Long newTemplateId)
         } else {
             newVol = volumeMgr.allocateDuplicateVolume(root, null);
         }
-        // 1. Save usage event and update resource count for user vm volumes
-        _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume);
-        //2. Create Usage event for the newly created volume
+
+        // Create Usage event for the newly created volume
         UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, newVol.getAccountId(), newVol.getDataCenterId(), newVol.getId(), newVol.getName(), newVol.getDiskOfferingId(), templateId, newVol.getSize());
         _usageEventDao.persist(usageEvent);
 
         handleManagedStorage(vm, root);
 
         _volsDao.attachVolume(newVol.getId(), vmId, newVol.getDeviceId());
 
-        /* Detach and destory the old root volume */
-
+        // Detach, destroy and create the usage event for the old root volume.
         _volsDao.detachVolume(root.getId());
-
         volumeMgr.destroyVolume(root);
+        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, root.getAccountId(), root.getDataCenterId(), root.getId(), root.getName(),
+                Volume.class.getName(), root.getUuid(), root.isDisplayVolume());
 
         // For VMware hypervisor since the old root volume is replaced by the new root volume, force expunge old root volume if it has been created in storage
         if (vm.getHypervisorType() == HypervisorType.VMware) {
