From 9e82365099757b092ebbf5c7fd764caa62fc2c33 Mon Sep 17 00:00:00 2001 From: Damodar Date: Fri, 21 Nov 2014 15:21:30 +0530 Subject: [PATCH] CLOUDSTACK-7948: Two VOLUME.DELETE Events are being registered instead of one - On Destroying a User VM belonging to a Project (cherry picked from commit 27fa8a94532bab0713cb813699afedfa70a5287b) Signed-off-by: Rohit Yadav --- server/src/com/cloud/storage/listener/VolumeStateListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/listener/VolumeStateListener.java b/server/src/com/cloud/storage/listener/VolumeStateListener.java index 9fd1423d1fe..9a739ba2bc1 100644 --- a/server/src/com/cloud/storage/listener/VolumeStateListener.java +++ b/server/src/com/cloud/storage/listener/VolumeStateListener.java @@ -82,7 +82,7 @@ public class VolumeStateListener implements StateListener UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), vol.getDiskOfferingId(), null, vol.getSize(), Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume()); } - } else if (transition.getToState() == State.Destroy) { + } else if (transition.getToState() == State.Destroy && vol.getVolumeType() != Volume.Type.ROOT) { //Do not Publish Usage Event for ROOT Disk as it would have been published already while destroying a VM UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_DELETE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume()); } else if (transition.getToState() == State.Uploaded) {