You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/07/29 15:24:01 UTC
[3/3] git commit: updated refs/heads/master to 1b398aa
CLOUDSTACK-3846 usage event is not generated for volume resize
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b398aa3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b398aa3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b398aa3
Branch: refs/heads/master
Commit: 1b398aa3fcc05cccdcc35267ebe97c1bd1145ff8
Parents: 63fea5e
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sat Jul 27 20:28:41 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Jul 29 18:51:00 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeManagerImpl.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b398aa3/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 e6d403c..2a97b0b 100644
--- a/server/src/com/cloud/storage/VolumeManagerImpl.java
+++ b/server/src/com/cloud/storage/VolumeManagerImpl.java
@@ -31,10 +31,6 @@ import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
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;
@@ -74,6 +70,9 @@ 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;
@@ -1265,6 +1264,11 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager {
volume.setDiskOfferingId(cmd.getNewDiskOfferingId());
}
_volsDao.update(volume.getId(), volume);
+ // Log usage event for volumes belonging user VM's only
+ UsageEventVO usageEvent = new UsageEventVO(
+ EventTypes.EVENT_VOLUME_RESIZE, volume.getAccountId(),
+ volume.getDataCenterId(), volume.getId(), volume.getName(), volume.getDiskOfferingId(), volume.getTemplateId(), volume.getSize());
+ _usageEventDao.persist(usageEvent);
/* Update resource count for the account on primary storage resource */
if (!shrinkOk) {