From b30827a0ec74d33838725afeda9cc1bb1444faf2 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 12 Sep 2011 20:22:07 +0530
Subject: [PATCH] bug 9778: Log snapshot create event only if the snapshot is
 in not removed state after backingUp to secondary. Log snapshot delete event
 for backed up snapshots only status 9778: resolved fixed

---
 .../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index ccd17843635..804a94431b8 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -419,8 +419,9 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma
             // Cleanup jobs to do after the snapshot has been created; decrement resource count
             if (snapshot != null) {
                 postCreateSnapshot(volumeId, snapshot.getId(), policyId, backedUp);
-
-                if (backedUp && (snapshot.getRemoved() == null)) {
+                //Check if the snapshot was removed while backingUp. If yes, do not log snapshot create usage event
+                SnapshotVO freshSnapshot = _snapshotDao.findById(snapshot.getId());
+                if ((freshSnapshot != null) && backedUp) {
                     UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), null, null,
                             v.getSize());
                     _usageEventDao.persist(usageEvent);