From a2e2ef6a763dff188eb24d4e098b7f1faf37e4f3 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Fri, 26 Jul 2013 17:34:06 -0700 Subject: [PATCH] CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage events are generated for one data disk after creating and attaching to VM. --- server/src/com/cloud/storage/VolumeManagerImpl.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index d7d62b0088b..bee6f799146 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -72,10 +72,6 @@ import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.CreateVolumeOVAAnswer; @@ -1038,15 +1034,6 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { } volume = _volsDao.persist(volume); - if (cmd.getSnapshotId() == null) { - // for volume created from snapshot, create usage event after volume - // creation - UsageEventVO usageEvent = new UsageEventVO( - EventTypes.EVENT_VOLUME_CREATE, volume.getAccountId(), - volume.getDataCenterId(), volume.getId(), volume.getName(), - diskOfferingId, null, size); - _usageEventDao.persist(usageEvent); - } UserContext.current().setEventDetails("Volume Id: " + volume.getId());