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 2015/01/07 09:58:11 UTC
[1/3] git commit: updated refs/heads/master to 01a325b
Repository: cloudstack
Updated Branches:
refs/heads/master 9eb8d538d -> 01a325b2b
Close transaction while fetching recent events
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/438f90a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/438f90a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/438f90a2
Branch: refs/heads/master
Commit: 438f90a2627c4a7408f02fc4b59be7eb566443be
Parents: 9eb8d53
Author: Kishan Kavala <ki...@apache.org>
Authored: Fri Nov 21 15:14:26 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Wed Jan 7 14:14:44 2015 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/438f90a2/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
index 4e35bf5..1739254 100644
--- a/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
+++ b/engine/schema/src/com/cloud/event/dao/UsageEventDaoImpl.java
@@ -124,6 +124,8 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
txn.rollback();
s_logger.error("error copying events from cloud db to usage db", ex);
throw new CloudRuntimeException(ex.getMessage());
+ } finally {
+ txn.close();
}
// Copy event details from cloud db to usage db
@@ -150,6 +152,8 @@ public class UsageEventDaoImpl extends GenericDaoBase<UsageEventVO, Long> implem
txn.rollback();
s_logger.error("error copying event details from cloud db to usage db", ex);
throw new CloudRuntimeException(ex.getMessage());
+ } finally {
+ txn.close();
}
return findRecentEvents(endDate);
[2/3] git commit: updated refs/heads/master to 01a325b
Posted by ki...@apache.org.
For Vm snapshot delete event, check for null size and set it as zero
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30ab4d3d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30ab4d3d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30ab4d3d
Branch: refs/heads/master
Commit: 30ab4d3d6623af3c6075a9dbee4f474932008bf5
Parents: 438f90a
Author: Kishan Kavala <ki...@apache.org>
Authored: Mon Nov 24 11:28:56 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Wed Jan 7 14:15:59 2015 +0530
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30ab4d3d/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 8429c60..5453be9 100644
--- a/usage/src/com/cloud/usage/UsageManagerImpl.java
+++ b/usage/src/com/cloud/usage/UsageManagerImpl.java
@@ -1726,7 +1726,8 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
Long offeringId = event.getOfferingId();
Long zoneId = event.getZoneId();
Long accountId = event.getAccountId();
- long size = event.getSize();
+ //Size could be null for VM snapshot delete events
+ long size = (event.getSize() == null) ? 0 : event.getSize();
Date created = event.getCreateDate();
Account acct = _accountDao.findByIdIncludingRemoved(event.getAccountId());
Long domainId = acct.getDomainId();
[3/3] git commit: updated refs/heads/master to 01a325b
Posted by ki...@apache.org.
Network Id for direct-network should not be included in usage record response. Direct network stats have network_id = 0. Ignore network with id = 0 in usage record
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01a325b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01a325b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01a325b2
Branch: refs/heads/master
Commit: 01a325b2bfde3f82faca1361cfab3f66ee78a524
Parents: 30ab4d3
Author: Kishan Kavala <ki...@apache.org>
Authored: Mon Nov 24 11:35:36 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Wed Jan 7 14:17:30 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiResponseHelper.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01a325b2/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index dd55486..4726c24 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -3169,9 +3169,11 @@ public class ApiResponseHelper implements ResponseGenerator {
}
}
//Network ID
- NetworkVO network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString());
- if (network != null) {
- usageRecResponse.setNetworkId(network.getUuid());
+ if((usageRecord.getNetworkId() != null) && (usageRecord.getNetworkId() != 0)) {
+ NetworkVO network = _entityMgr.findByIdIncludingRemoved(NetworkVO.class, usageRecord.getNetworkId().toString());
+ if (network != null) {
+ usageRecResponse.setNetworkId(network.getUuid());
+ }
}
} else if (usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_READ || usageRecord.getUsageType() == UsageTypes.VM_DISK_IO_WRITE