You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/05/30 11:43:16 UTC
[1/4] git commit: updated refs/heads/4.4-forward to cc663bb
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward f5ce280da -> cc663bb7f
refs/heads/master 7c2b1deb3 -> bdde5335f
FIXED CLOUDSTACK-6808 Need to add Database Information to Alter table statements in a commit to schema-430to440.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5a1423d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5a1423d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5a1423d
Branch: refs/heads/4.4-forward
Commit: c5a1423d3d02e33c33eb630f6f4df24b731eba69
Parents: f5ce280
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri May 30 11:47:17 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri May 30 14:50:40 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-430to440.sql | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5a1423d/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 85eb173..cb042e4 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -1696,11 +1696,11 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'Other PV', 139, now(), 0);
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'Other PV', 140, now(), 0);
-alter table user_ip_address add column removed datetime DEFAULT NULL COMMENT 'date removed';
-alter table user_ip_address add column created datetime NULL COMMENT 'date created';
+alter table `cloud`.`user_ip_address` add column removed datetime DEFAULT NULL COMMENT 'date removed';
+alter table `cloud`.`user_ip_address` add column created datetime NULL COMMENT 'date created';
-alter table vlan add column removed datetime DEFAULT NULL COMMENT 'date removed';
-alter table vlan add column created datetime NULL COMMENT 'date created';
+alter table `cloud`.`vlan` add column removed datetime DEFAULT NULL COMMENT 'date removed';
+alter table `cloud`.`vlan` add column created datetime NULL COMMENT 'date created';
-alter table user_ip_address drop key public_ip_address;
-alter table user_ip_address add UNIQUE KEY public_ip_address (public_ip_address,source_network_id, removed);
\ No newline at end of file
+alter table `cloud`.`user_ip_address` drop key public_ip_address;
+alter table `cloud`.`user_ip_address` add UNIQUE KEY public_ip_address (public_ip_address,source_network_id, removed);
\ No newline at end of file
[4/4] git commit: updated refs/heads/master to bdde533
Posted by ki...@apache.org.
FIXED CLOUDSTACK-6669 Support volume resize in usage server
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdde5335
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdde5335
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdde5335
Branch: refs/heads/master
Commit: bdde5335f9988e460a667da97ebe0cde2e74e7a1
Parents: dbd05e3
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri May 30 11:47:56 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri May 30 15:03:02 2014 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 21 +++++---------------
1 file changed, 5 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdde5335/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 4ceecbb..159380b 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -961,9 +961,8 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
}
private boolean isVolumeEvent(String eventType) {
- if (eventType == null)
- return false;
- return (eventType.equals(EventTypes.EVENT_VOLUME_CREATE) || eventType.equals(EventTypes.EVENT_VOLUME_DELETE));
+ return eventType != null &&
+ (eventType.equals(EventTypes.EVENT_VOLUME_CREATE) || eventType.equals(EventTypes.EVENT_VOLUME_DELETE) || eventType.equals(EventTypes.EVENT_VOLUME_RESIZE));
}
private boolean isTemplateEvent(String eventType) {
@@ -1366,20 +1365,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
private void createVolumeHelperEvent(UsageEventVO event) {
- Long doId = -1L;
- long zoneId = -1L;
- Long templateId = -1L;
- long size = -1L;
-
long volId = event.getResourceId();
- if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType())) {
- doId = event.getOfferingId();
- zoneId = event.getZoneId();
- templateId = event.getTemplateId();
- size = event.getSize();
- }
- if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType())) {
+ if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType()) || EventTypes.EVENT_VOLUME_RESIZE.equals(event.getType())) {
SearchCriteria<UsageVolumeVO> sc = _usageVolumeDao.createSearchCriteria();
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
sc.addAnd("id", SearchCriteria.Op.EQ, volId);
@@ -1389,6 +1377,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
//This is a safeguard to avoid double counting of volumes.
s_logger.error("Found duplicate usage entry for volume: " + volId + " assigned to account: " + event.getAccountId() + "; marking as deleted...");
}
+ //an entry exists if it is a resize volume event. marking the existing deleted and creating a new one in the case of resize.
for (UsageVolumeVO volumesVO : volumesVOs) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("deleting volume: " + volumesVO.getId() + " from account: " + volumesVO.getAccountId());
@@ -1400,7 +1389,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
s_logger.debug("create volume with id : " + volId + " for account: " + event.getAccountId());
}
Account acct = _accountDao.findByIdIncludingRemoved(event.getAccountId());
- UsageVolumeVO volumeVO = new UsageVolumeVO(volId, zoneId, event.getAccountId(), acct.getDomainId(), doId, templateId, size, event.getCreateDate(), null);
+ UsageVolumeVO volumeVO = new UsageVolumeVO(volId, event.getZoneId(), event.getAccountId(), acct.getDomainId(), event.getOfferingId(), event.getTemplateId(), event.getSize(), event.getCreateDate(), null);
_usageVolumeDao.persist(volumeVO);
} else if (EventTypes.EVENT_VOLUME_DELETE.equals(event.getType())) {
SearchCriteria<UsageVolumeVO> sc = _usageVolumeDao.createSearchCriteria();
[3/4] git commit: updated refs/heads/master to bdde533
Posted by ki...@apache.org.
FIXED CLOUDSTACK-6808 Need to add Database Information to Alter table statements in a commit to schema-430to440.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dbd05e3f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dbd05e3f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dbd05e3f
Branch: refs/heads/master
Commit: dbd05e3ff5015a867652d805b08965851608e577
Parents: 7c2b1de
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri May 30 11:47:17 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri May 30 15:02:18 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-430to440.sql | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dbd05e3f/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 2262608..7cd01d7 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -1677,11 +1677,11 @@ ALTER TABLE `cloud`.`load_balancer_healthcheck_policies` ADD COLUMN `display` ti
ALTER TABLE `cloud`.`load_balancer_stickiness_policies` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the policy can be displayed to the end user';
-alter table user_ip_address add column removed datetime DEFAULT NULL COMMENT 'date removed';
-alter table user_ip_address add column created datetime NULL COMMENT 'date created';
+alter table `cloud`.`user_ip_address` add column removed datetime DEFAULT NULL COMMENT 'date removed';
+alter table `cloud`.`user_ip_address` add column created datetime NULL COMMENT 'date created';
-alter table vlan add column removed datetime DEFAULT NULL COMMENT 'date removed';
-alter table vlan add column created datetime NULL COMMENT 'date created';
+alter table `cloud`.`vlan` add column removed datetime DEFAULT NULL COMMENT 'date removed';
+alter table `cloud`.`vlan` add column created datetime NULL COMMENT 'date created';
-alter table user_ip_address drop key public_ip_address;
-alter table user_ip_address add UNIQUE KEY public_ip_address (public_ip_address,source_network_id, removed);
\ No newline at end of file
+alter table `cloud`.`user_ip_address` drop key public_ip_address;
+alter table `cloud`.`user_ip_address` add UNIQUE KEY public_ip_address (public_ip_address,source_network_id, removed);
[2/4] git commit: updated refs/heads/4.4-forward to cc663bb
Posted by ki...@apache.org.
FIXED CLOUDSTACK-6669 Support volume resize in usage server
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc663bb7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc663bb7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc663bb7
Branch: refs/heads/4.4-forward
Commit: cc663bb7fc515a4960cd483e8f5697bc141ce95e
Parents: c5a1423
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri May 30 11:47:56 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri May 30 14:50:52 2014 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 21 +++++---------------
1 file changed, 5 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc663bb7/usage/src/com/cloud/usage/UsageManagerImpl.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageManagerImpl.java b/usage/src/com/cloud/usage/UsageManagerImpl.java
index 4ceecbb..159380b 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -961,9 +961,8 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
}
private boolean isVolumeEvent(String eventType) {
- if (eventType == null)
- return false;
- return (eventType.equals(EventTypes.EVENT_VOLUME_CREATE) || eventType.equals(EventTypes.EVENT_VOLUME_DELETE));
+ return eventType != null &&
+ (eventType.equals(EventTypes.EVENT_VOLUME_CREATE) || eventType.equals(EventTypes.EVENT_VOLUME_DELETE) || eventType.equals(EventTypes.EVENT_VOLUME_RESIZE));
}
private boolean isTemplateEvent(String eventType) {
@@ -1366,20 +1365,9 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
private void createVolumeHelperEvent(UsageEventVO event) {
- Long doId = -1L;
- long zoneId = -1L;
- Long templateId = -1L;
- long size = -1L;
-
long volId = event.getResourceId();
- if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType())) {
- doId = event.getOfferingId();
- zoneId = event.getZoneId();
- templateId = event.getTemplateId();
- size = event.getSize();
- }
- if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType())) {
+ if (EventTypes.EVENT_VOLUME_CREATE.equals(event.getType()) || EventTypes.EVENT_VOLUME_RESIZE.equals(event.getType())) {
SearchCriteria<UsageVolumeVO> sc = _usageVolumeDao.createSearchCriteria();
sc.addAnd("accountId", SearchCriteria.Op.EQ, event.getAccountId());
sc.addAnd("id", SearchCriteria.Op.EQ, volId);
@@ -1389,6 +1377,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
//This is a safeguard to avoid double counting of volumes.
s_logger.error("Found duplicate usage entry for volume: " + volId + " assigned to account: " + event.getAccountId() + "; marking as deleted...");
}
+ //an entry exists if it is a resize volume event. marking the existing deleted and creating a new one in the case of resize.
for (UsageVolumeVO volumesVO : volumesVOs) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("deleting volume: " + volumesVO.getId() + " from account: " + volumesVO.getAccountId());
@@ -1400,7 +1389,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
s_logger.debug("create volume with id : " + volId + " for account: " + event.getAccountId());
}
Account acct = _accountDao.findByIdIncludingRemoved(event.getAccountId());
- UsageVolumeVO volumeVO = new UsageVolumeVO(volId, zoneId, event.getAccountId(), acct.getDomainId(), doId, templateId, size, event.getCreateDate(), null);
+ UsageVolumeVO volumeVO = new UsageVolumeVO(volId, event.getZoneId(), event.getAccountId(), acct.getDomainId(), event.getOfferingId(), event.getTemplateId(), event.getSize(), event.getCreateDate(), null);
_usageVolumeDao.persist(volumeVO);
} else if (EventTypes.EVENT_VOLUME_DELETE.equals(event.getType())) {
SearchCriteria<UsageVolumeVO> sc = _usageVolumeDao.createSearchCriteria();