Repository: cloudstack Updated Branches: refs/heads/master a2ddabde0 -> d4663df7c
Make volume deletion publish event, removed by 781648fb1003c8c32875e9ff7a6c4ef4694539f7 Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d4663df7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d4663df7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d4663df7 Branch: refs/heads/master Commit: d4663df7c9d24aa9710451fce911b688e432735e Parents: a2ddabd Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Feb 5 15:01:39 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Feb 5 15:01:39 2015 +0530 ---------------------------------------------------------------------- .../apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4663df7/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java index 9ddaa9f..9e7f409 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -1480,6 +1480,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati } // 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()); _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.volume, volume.isDisplay()); //FIXME - why recalculate and not decrement _resourceLimitMgr.recalculateResourceCount(volume.getAccountId(), volume.getDomainId(), ResourceType.primary_storage.getOrdinal());
