You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/17 09:14:45 UTC
git commit: updated refs/heads/master to 21b1c94
Updated Branches:
refs/heads/master 5fbec76c8 -> 21b1c9449
CLOUDSTACK-3376: NPE: resource count calculation from the account manager on account cleanup
This issue is happing because of the steps the code follow to cleanup the account.
The cleanupAccount was deleting the entries from the resource_limit and
resource_count table and performing further cleaning afterwards. Ideally, deletion
of entries from resourceLimit and resourceCount should be the last step in
cleanupAccount process.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21b1c944
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21b1c944
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21b1c944
Branch: refs/heads/master
Commit: 21b1c9449a1289db9fa92c2ec76a936006100ab3
Parents: 5fbec76
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Jul 12 14:11:36 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jul 17 12:39:16 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/user/AccountManagerImpl.java | 21 ++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21b1c944/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 4b06e78..512f913 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -734,16 +734,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
int vlansReleased = _accountGuestVlanMapDao.removeByAccountId(accountId);
s_logger.info("deleteAccount: Released " + vlansReleased + " dedicated guest vlan ranges from account " + accountId);
- // Update resource count for this account and for parent domains.
- List<ResourceCountVO> resourceCounts = _resourceCountDao.listByOwnerId(accountId, ResourceOwnerType.Account);
- for (ResourceCountVO resourceCount : resourceCounts) {
- _resourceLimitMgr.decrementResourceCount(accountId, resourceCount.getType(), resourceCount.getCount());
- }
-
- // Delete resource count and resource limits entries set for this account (if there are any).
- _resourceCountDao.removeEntriesByOwner(accountId, ResourceOwnerType.Account);
- _resourceLimitDao.removeEntriesByOwner(accountId, ResourceOwnerType.Account);
-
// release account specific acquired portable IP's. Since all the portable IP's must have been already
// disassociated with VPC/guest network (due to deletion), so just mark portable IP as free.
List<? extends IpAddress> portableIpsToRelease = _ipAddressDao.listByAccount(accountId);
@@ -761,6 +751,17 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
}
}
}
+
+ // Updating and deleting the resourceLimit and resourceCount should be the last step in cleanupAccount process.
+ // Update resource count for this account and for parent domains.
+ List<ResourceCountVO> resourceCounts = _resourceCountDao.listByOwnerId(accountId, ResourceOwnerType.Account);
+ for (ResourceCountVO resourceCount : resourceCounts) {
+ _resourceLimitMgr.decrementResourceCount(accountId, resourceCount.getType(), resourceCount.getCount());
+ }
+
+ // Delete resource count and resource limits entries set for this account (if there are any).
+ _resourceCountDao.removeEntriesByOwner(accountId, ResourceOwnerType.Account);
+ _resourceLimitDao.removeEntriesByOwner(accountId, ResourceOwnerType.Account);
return true;
} catch (Exception ex) {
s_logger.warn("Failed to cleanup account " + account + " due to ", ex);