From 8abb85f9e8bb03879f3e7cae1ca88f47307c3275 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 21 Sep 2011 17:37:39 -0700 Subject: [PATCH] bug 11513: add more log in the cleanup network Reviewed-by:alena@citrix.com --- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++++ server/src/com/cloud/network/guru/DirectNetworkGuru.java | 4 ++++ server/src/com/cloud/network/guru/PublicNetworkGuru.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 7ff5c0daed5..1ddb7c3d06e 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1478,6 +1478,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag @Override public void cleanupNics(VirtualMachineProfile vm) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Cleaning network for vm: " + vm.getId()); + } + List nics = _nicDao.listByVmId(vm.getId()); for (NicVO nic : nics) { nic.setState(Nic.State.Deallocating); diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 959cfc88a5c..bf5ab0f54aa 100644 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -210,6 +210,10 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { @Override public void deallocate(Network network, NicProfile nic, VirtualMachineProfile vm) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("direct network deallocate network: networkId: " + nic.getNetworkId() + ", ip: " + nic.getIp4Address()); + } + IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(nic.getNetworkId(), nic.getIp4Address()); if (ip != null) { _networkMgr.markIpAsUnavailable(ip.getId()); diff --git a/server/src/com/cloud/network/guru/PublicNetworkGuru.java b/server/src/com/cloud/network/guru/PublicNetworkGuru.java index 88d36928b8e..ee29c123cf5 100644 --- a/server/src/com/cloud/network/guru/PublicNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PublicNetworkGuru.java @@ -181,6 +181,10 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru { @Override public void deallocate(Network network, NicProfile nic, VirtualMachineProfile vm) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("public network deallocate network: networkId: " + nic.getNetworkId() + ", ip: " + nic.getIp4Address()); + } + IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(nic.getNetworkId(), nic.getIp4Address()); if (ip != null && nic.getReservationStrategy() != ReservationStrategy.Managed) { _networkMgr.markIpAsUnavailable(ip.getId());