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/08/22 00:39:55 UTC
[4/6] git commit: More logging to lock operations on the network
More logging to lock operations on the network
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7d0ad98c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7d0ad98c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7d0ad98c
Branch: refs/heads/master
Commit: 7d0ad98c937e7fd3f88359782ec25021b650b22d
Parents: 14dd3f0
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Fri Aug 17 16:25:04 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Aug 21 15:25:17 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 9 +++++++--
.../router/VirtualNetworkApplianceManagerImpl.java | 7 +++++++
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d0ad98c/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 210ec0d..30620d8 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1928,6 +1928,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
ex.addProxyObject("networks", networkId, "networkId");
throw ex;
}
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Lock is acquired for network id " + networkId + " as a part of network implement");
+ }
try {
NetworkGuru guru = _networkGurus.get(network.getGuruName());
@@ -1973,10 +1977,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
shutdownNetwork(networkId, context, false);
}
+
+ _networksDao.releaseFromLockTable(networkId);
if (s_logger.isDebugEnabled()) {
- s_logger.debug("Releasing lock for network id " + networkId);
+ s_logger.debug("Lock is released for network id " + networkId + " as a part of network implement");
}
- _networksDao.releaseFromLockTable(networkId);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7d0ad98c/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2e1ec2a..8c8b927 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1309,6 +1309,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
if (network == null) {
throw new ConcurrentOperationException("Unable to lock network " + guestNetwork.getId());
}
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Lock is acquired for network id " + network.getId() + " as a part of router startup in " + dest);
+ }
try {
//Check if providers are supported in the physical networks
@@ -1362,6 +1366,9 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
} finally {
if (network != null) {
_networkDao.releaseFromLockTable(network.getId());
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Lock is released for network id " + network.getId() + " as a part of router startup in " + dest);
+ }
}
}
return routers;