You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/07/27 02:45:29 UTC
git commit: updated refs/heads/master to b17b40b
Updated Branches:
refs/heads/master 1834e8147 -> b17b40bbf
CLOUDSTACK-3857:[Object_Store_Refactor][Usage] Two VOLUME_CREATE usage
events are generated for one data disk after creating and attaching to
VM.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b17b40bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b17b40bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b17b40bb
Branch: refs/heads/master
Commit: b17b40bbfef96b1908513ed4570ad2e5cb0cac9e
Parents: 1834e81
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jul 26 17:45:05 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Jul 26 17:45:05 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeManagerImpl.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b17b40bb/server/src/com/cloud/storage/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java
index c2d581b..e6d403c 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -34,6 +34,7 @@ import javax.naming.ConfigurationException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
+
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd;
@@ -1033,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);
- }
CallContext.current().setEventDetails("Volume Id: " + volume.getId());