You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/06 12:28:42 UTC
[17/20] git commit: updated refs/heads/vmware-datamodel to 776b043
CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e56d2a40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e56d2a40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e56d2a40
Branch: refs/heads/vmware-datamodel
Commit: e56d2a401c40b4208d062c0a0ce1ec01df73dd08
Parents: 7206761
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Thu May 2 13:45:39 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Mon May 6 15:11:49 2013 +0530
----------------------------------------------------------------------
.../storage/download/DownloadMonitorImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e56d2a40/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 5d7a210..220cbff 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -875,7 +875,9 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
tmpltHost.setPhysicalSize(tmpltInfo.getPhysicalSize());
tmpltHost.setLastUpdated(new Date());
- if (tmpltInfo.getSize() > 0) {
+ // Skipping limit checks for SYSTEM Account and for the templates created from volumes or snapshots
+ // which already got checked and incremented during createTemplate API call.
+ if (tmpltInfo.getSize() > 0 && tmplt.getAccountId() != Account.ACCOUNT_ID_SYSTEM && tmplt.getUrl() != null) {
long accountId = tmplt.getAccountId();
try {
_resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(accountId),