From e74d8888c7a91c5bcf6a65b24ca86261afc2683c Mon Sep 17 00:00:00 2001 From: kishan Date: Tue, 1 Feb 2011 13:04:21 +0530 Subject: [PATCH] bug 8151: Avoid volume delete event for volumes which were never attached status 8151: resolved fixed --- server/src/com/cloud/storage/StorageManagerImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 40061fae044..3e1d82ad2e5 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1530,9 +1530,11 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag _volsDao.update(volume, Volume.Event.Destroy); long volumeId = volume.getId(); - UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volumeId, - volume.getName(), null, null, null); - _usageEventDao.persist(usageEvent); + if(volume.getPoolId() != null){ + UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_DELETE, volume.getAccountId(), volume.getDataCenterId(), volumeId, + volume.getName(), null, null, null); + _usageEventDao.persist(usageEvent); + } // Delete the recurring snapshot policies for this volume. _snapshotMgr.deletePoliciesForVolume(volumeId);