cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 4e7498b
Date Fri, 02 May 2014 21:21:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward fe84b674c -> 4e7498bc0


LOUDSTACK-6475: cleanupVPC task - removed the transaction wrapping up multiple VPC destroy
as the destroy operation has external calls, to prevent long-locked transaction.
Reviewed-by: Prachi Damle


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e7498bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e7498bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e7498bc

Branch: refs/heads/4.4-forward
Commit: 4e7498bc08a11d7b7ca35c2ed3babb85299d74b4
Parents: fe84b67
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri May 2 13:47:13 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri May 2 14:20:27 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e7498bc/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 3e83c81..da9cc9b 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -35,8 +35,6 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.user.vpc.ListPrivateGatewaysCmd;
@@ -46,6 +44,7 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationSe
 import org.apache.cloudstack.framework.config.ConfigDepot;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+import org.apache.log4j.Logger;
 
 import com.cloud.configuration.Config;
 import com.cloud.configuration.ConfigurationManager;
@@ -130,7 +129,6 @@ import com.cloud.utils.db.Transaction;
 import com.cloud.utils.db.TransactionCallback;
 import com.cloud.utils.db.TransactionCallbackNoReturn;
 import com.cloud.utils.db.TransactionCallbackWithException;
-import com.cloud.utils.db.TransactionCallbackWithExceptionNoReturn;
 import com.cloud.utils.db.TransactionStatus;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.exception.ExceptionUtil;
@@ -2160,9 +2158,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
                 }
 
                 try {
-                    Transaction.execute(new TransactionCallbackWithExceptionNoReturn<Exception>()
{
-                        @Override
-                        public void doInTransactionWithoutResult(TransactionStatus status)
throws Exception {
                     // Cleanup inactive VPCs
                     List<VpcVO> inactiveVpcs = _vpcDao.listInactiveVpcs();
                     s_logger.info("Found " + inactiveVpcs.size() + " removed VPCs to cleanup");
@@ -2170,8 +2165,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
                         s_logger.debug("Cleaning up " + vpc);
                         destroyVpc(vpc, _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM),
User.UID_SYSTEM);
                     }
-                        }
-                    });
                 } catch (Exception e) {
                     s_logger.error("Exception ", e);
                 } finally {


Mime
View raw message