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:23:59 UTC
[1/3] git commit: updated refs/heads/master to 1b398aa
Updated Branches:
refs/heads/master 4dc874fef -> 1b398aa3f
CLOUDSTACK-3215 Logs in the Software router are not being rotated
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8edf6b34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8edf6b34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8edf6b34
Branch: refs/heads/master
Commit: 8edf6b346789f826847245472977913b56bce17e
Parents: 4dc874f
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sat Jul 27 18:25:04 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Jul 29 18:50:15 2013 +0530
----------------------------------------------------------------------
patches/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8edf6b34/patches/pom.xml
----------------------------------------------------------------------
diff --git a/patches/pom.xml b/patches/pom.xml
index 00eec02..438ec6e 100644
--- a/patches/pom.xml
+++ b/patches/pom.xml
@@ -60,9 +60,16 @@
filemode="755">
<include name="**/*" />
<exclude name="**/.classpath" />
+ <exclude name="**/log**"/>
+ <exclude name="**/logrotate.d"/>
<exclude name="**/.project" />
<exclude name="**/wscript_build" />
</tarfileset>
+ <tarfileset dir="${basedir}/target/build-patch/"
+ filemode="644">
+ <include name="**/log**"/>
+ <include name="**/logrotate.d/**"/>
+ </tarfileset>
</tar>
<gzip destfile="${basedir}/target/cloud-scripts.tgz" src="${basedir}/target/patch.tar" />
<delete dir="${basedir}/target/build-patch" />
[3/3] git commit: updated refs/heads/master to 1b398aa
Posted by de...@apache.org.
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) {
[2/3] git commit: updated refs/heads/master to 1b398aa
Posted by de...@apache.org.
CLOUDSTACK-3877 Unable to Resize Volume (kvm, vmware)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63fea5e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63fea5e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63fea5e9
Branch: refs/heads/master
Commit: 63fea5e94e50c0bd9f01045f67befa9673ad7dc5
Parents: 8edf6b3
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sat Jul 27 20:28:03 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Jul 29 18:50:41 2013 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63fea5e9/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 7696bcc..e6595b2 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -241,7 +241,12 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
pstmt.setLong(1, volumeId);
ResultSet rs = pstmt.executeQuery();
if (rs.next()) {
- return HypervisorType.getType(rs.getString(1));
+ String hypervisor;
+ if (rs.getString(1) != null)
+ hypervisor = rs.getString(1);
+ else
+ hypervisor = rs.getString(2);
+ return HypervisorType.getType(hypervisor);
}
return HypervisorType.None;
} catch (SQLException e) {