etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 10727: fixed duplicated usage event generation when create volume from snapshot 

status 10727: resolved fixed
This commit is contained in:
alena 2011-07-14 10:28:28 -07:00
parent 1a6d859f22
commit d11ac32f08
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -577,7 +577,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
return new Pair<VolumeVO, String>(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<VolumeVO, String> 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;
}