From d158b38007e8b4106b10300c18eb0e62b26a2795 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Fri, 17 Aug 2012 16:25:04 -0700
Subject: [PATCH] More logging to lock operations on the network

---
 server/src/com/cloud/network/NetworkManagerImpl.java  | 11 ++++++++---
 .../router/VirtualNetworkApplianceManagerImpl.java    |  7 +++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 59812eab73f..ffe3eee17f8 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1921,6 +1921,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());
@@ -1966,10 +1970,11 @@ 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);
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("Lock is released for network id " + networkId + " as a part of network implement");
+            }
         }
     }
 
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 47421425383..4182c29c19e 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1386,6 +1386,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
@@ -1439,6 +1443,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;