CLOUDSTACK-7870: When Vm deployments fail and end in error state volume count should be decremented

nitinmeh · yadvr · commit 4ea0dcda9bca · 2015-02-06T16:24:06.000+05:30
(cherry picked from commit a8b89be) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -1464,6 +1464,7 @@ public void destroyVolume(Volume volume) {
             } else {
                 volService.destroyVolume(volume.getId());
             }
+            // FIXME - All this is boiler plate code and should be done as part of state transition. This shouldn't be part of orchestrator.
             // publish usage event for the volume
             UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(),
                     Volume.class.getName(), volume.getUuid(), volume.isDisplayVolume());
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -4812,7 +4812,10 @@ public UserVm restoreVMInternal(Account caller, UserVmVO vm, Long newTemplateId)
                 newVol = volumeMgr.allocateDuplicateVolume(root, null);
             }
 
-            // Create Usage event for the newly created volume
+            // 1. Save usage event and update resource count for user vm volumes
+            _resourceLimitMgr.incrementResourceCount(newVol.getAccountId(), ResourceType.volume, newVol.isDisplay());
+            _resourceLimitMgr.incrementResourceCount(newVol.getAccountId(), ResourceType.primary_storage, newVol.isDisplay(), new Long(newVol.getSize()));
+            // 2. 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(), template.getId(), newVol.getSize());
             _usageEventDao.persist(usageEvent);
 

Original file line number	Diff line number	Diff line change
`@@ -1464,6 +1464,7 @@ public void destroyVolume(Volume volume) {`
`1464`	`1464`	`} else {`
`1465`	`1465`	`volService.destroyVolume(volume.getId());`
`1466`	`1466`	`}`
	`1467`	`+ // FIXME - All this is boiler plate code and should be done as part of state transition. This shouldn't be part of orchestrator.`
`1467`	`1468`	`// publish usage event for the volume`
`1468`	`1469`	`UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(),`
`1469`	`1470`	`Volume.class.getName(), volume.getUuid(), volume.isDisplayVolume());`