You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/06/16 00:38:03 UTC
[25/51] [abbrv] git commit: Release acquired lock for VPC
Release acquired lock for VPC
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/39422a31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/39422a31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/39422a31
Branch: refs/heads/vpc
Commit: 39422a313880eeea69e327f539bde7356abed6a0
Parents: 7e119e4
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jun 11 14:31:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jun 15 14:27:33 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 6 +++
.../VpcVirtualNetworkApplianceManagerImpl.java | 26 ++++++--------
wscript | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39422a31/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index d67b9ea..9f11fc5 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1078,6 +1078,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
txn.commit();
} finally {
if (accountToLock != null) {
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Releasing lock account " + ipOwner);
+ }
_accountDao.releaseFromLockTable(ipOwner.getId());
s_logger.debug("Associate IP address lock released");
}
@@ -1997,6 +2000,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
shutdownNetwork(networkId, context, false);
}
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Releasing lock for network id " + networkId);
+ }
_networksDao.releaseFromLockTable(networkId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39422a31/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index c063239..67e37d5 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -19,8 +19,6 @@ import javax.ejb.Local;
import org.apache.log4j.Logger;
-import sun.security.jca.ProviderList;
-
import com.cloud.deploy.DataCenterDeployment;
import com.cloud.deploy.DeployDestination;
import com.cloud.deploy.DeploymentPlan;
@@ -91,19 +89,17 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
Pair<DeploymentPlan, List<DomainRouterVO>> planAndRouters = getDeploymentPlanAndRouters(vpc.getId(), dest);
DeploymentPlan plan = planAndRouters.first();
List<DomainRouterVO> routers = planAndRouters.second();
-
- //2) Return routers if exist
- if (routers.size() >= 1) {
- return routers;
- }
-
- Long offeringId = _vpcOffDao.findById(vpc.getVpcOfferingId()).getServiceOfferingId();
- if (offeringId == null) {
- offeringId = _offering.getId();
- }
-
- //3) Deploy Virtual Router
- try {
+ try {
+ //2) Return routers if exist
+ if (routers.size() >= 1) {
+ return routers;
+ }
+
+ Long offeringId = _vpcOffDao.findById(vpc.getVpcOfferingId()).getServiceOfferingId();
+ if (offeringId == null) {
+ offeringId = _offering.getId();
+ }
+ //3) Deploy Virtual Router
List<? extends PhysicalNetwork> pNtwks = _pNtwkDao.listByZone(vpc.getZoneId());
VirtualRouterProvider vpcVrProvider = null;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/39422a31/wscript
----------------------------------------------------------------------
diff --git a/wscript b/wscript
index fe19efe..0e05eb7 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
# if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
-VERSION = '3.0.3.2012-06-11T20:32:53Z'
+VERSION = '3.0.3.2012-06-11T21:29:17Z'
APPNAME = 'cloud'
import shutil,os