From d65bef383cc456cade72a53492a7ecd91569f364 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Tue, 30 Aug 2011 14:08:35 -0700
Subject: [PATCH] Mark account as cleanup_required=0 when cleanup was finished
 successfully

---
 server/src/com/cloud/user/AccountManagerImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 474c5c0e1a0..82d97d25f9c 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1851,7 +1851,10 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
                     for (AccountVO account : removedAccounts) {
                         s_logger.debug("Cleaning up " + account.getId());
                         try {
-                            cleanupAccount(account, getSystemUser().getId(), getSystemAccount());
+                            if (cleanupAccount(account, getSystemUser().getId(), getSystemAccount())) {
+                                account.setNeedsCleanup(false);
+                                _accountDao.update(account.getId(), account);
+                            }
                         } catch (Exception e) {
                             s_logger.error("Skipping due to error on account " + account.getId(), e);
                         }
@@ -1874,6 +1877,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
                     
                     //cleanup inactive domains
                     List<DomainVO> inactiveDomains = _domainDao.findInactiveDomains();
+                    s_logger.info("Found " + inactiveDomains.size() + " inactive domains to cleanup");
                     for (DomainVO inactiveDomain : inactiveDomains) {
                         long domainId = inactiveDomain.getId();
                         try {