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 2014/10/27 10:52:36 UTC
git commit: updated refs/heads/4.5 to db6a0d6
Repository: cloudstack
Updated Branches:
refs/heads/4.5 c5fa7cc49 -> db6a0d65a
No need to log discrepancy resource count message for Primary and secondary storage.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db6a0d65
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db6a0d65
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db6a0d65
Branch: refs/heads/4.5
Commit: db6a0d65aabf49146b74a33ef70e455d8d823b4d
Parents: c5fa7cc
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Mon Oct 27 14:54:21 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Mon Oct 27 15:26:06 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db6a0d65/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 63150eb..d15b68a 100755
--- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -888,7 +888,8 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim
}
_resourceCountDao.setResourceCount(accountId, ResourceOwnerType.Account, type, (newCount == null) ? 0 : newCount.longValue());
- if (!Long.valueOf(oldCount).equals(newCount)) {
+ // No need to log message for primary and secondary storage because both are recalculating the resource count which will not lead to any discrepancy.
+ if (!Long.valueOf(oldCount).equals(newCount) && (type != Resource.ResourceType.primary_storage && type != Resource.ResourceType.secondary_storage)) {
s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type +
" for account ID " + accountId + " is fixed during resource count recalculation.");
}