From d11ac32f081930d909fb6823102f5eefbf110cdb Mon Sep 17 00:00:00 2001 From: alena Date: Thu, 14 Jul 2011 10:28:28 -0700 Subject: [PATCH] bug 10727: fixed duplicated usage event generation when create volume from snapshot status 10727: resolved fixed --- .../com/cloud/storage/StorageManagerImpl.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 6979f260eb3..5c8ed807520 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -577,7 +577,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag return new Pair(createdVolume, details); } - @DB protected VolumeVO createVolumeFromSnapshot(VolumeVO volume, long snapshotId) { // By default, assume failure. @@ -586,25 +585,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag Pair volumeDetails = createVolumeFromSnapshot(volume, snapshot); createdVolume = volumeDetails.first(); - - Transaction txn = Transaction.currentTxn(); - txn.start(); - Long diskOfferingId = volume.getDiskOfferingId(); - - if (createdVolume.getPath() != null) { - Long offeringId = null; - if (diskOfferingId != null) { - DiskOfferingVO offering = _diskOfferingDao.findById(diskOfferingId); - if (offering != null && (offering.getType() == DiskOfferingVO.Type.Disk)) { - offeringId = offering.getId(); - } - } - - UsageEventVO usageEvent = new UsageEventVO(EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), volume.getDataCenterId(), volume.getId(), volume.getName(), offeringId, null, - createdVolume.getSize()); - _usageEventDao.persist(usageEvent); - } - txn.commit(); + return createdVolume; }