From: Michael Vorburger Date: Tue, 6 Mar 2018 13:55:54 +0000 (+0100) Subject: Fix more bad logging in vpnmanager X-Git-Tag: release/fluorine~381 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ce0dc0bcd3acd7de1b51e5e54b49e47f636b7902;p=netvirt.git Fix more bad logging in vpnmanager Change-Id: If437bcf5a27cd9f66e256143a7d6623407b25c33 Signed-off-by: Michael Vorburger --- diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java index 0acd60eff9..ef7e051e17 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/InterfaceStateChangeListener.java @@ -326,11 +326,10 @@ public class InterfaceStateChangeListener @Override public void onFailure(Throwable throwable) { if (add) { - LOG.error("InterfaceStateChangeListener: VrfEntries for {} failed to store into destination {}" - + " with exception: {}", interfaceName, txnDestination, throwable); + LOG.error("InterfaceStateChangeListener: VrfEntries for {} failed to store into destination {}", + interfaceName, txnDestination, throwable); } else { - LOG.error("InterfaceStateChangeListener: VrfEntries for {} removal failed with exception: {}", - interfaceName, throwable); + LOG.error("InterfaceStateChangeListener: VrfEntries for {} removal failed", interfaceName, throwable); VpnUtil.unsetScheduledToRemoveForVpnInterface(dataBroker, interfaceName); } } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java index 45e59c6e0f..a427fedb39 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRouteInterfaceStateChangeListener.java @@ -102,7 +102,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange dpnId = InterfaceUtils.getDpIdFromInterface(intrf); } catch (Exception e) { LOG.error("{} add: Unable to obtain dpnId for interface {} in subnet {}," - + " subnetroute inclusion for this interface failed with exception {}", + + " subnetroute inclusion for this interface failed", LOGGING_PREFIX, interfaceName, subnetId, e); } InstanceIdentifier id = VpnUtil @@ -150,7 +150,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange dpnId = InterfaceUtils.getDpIdFromInterface(intrf); } catch (Exception e) { LOG.error("{} remove: Unable to retrieve dpnId for interface {} in subnet {}. " - + "Fetching from vpn interface itself due to exception {}", + + "Fetching from vpn interface itself", LOGGING_PREFIX, intrf.getName(), subnetId, e); } InstanceIdentifier id = VpnUtil @@ -219,7 +219,7 @@ public class SubnetRouteInterfaceStateChangeListener extends AsyncDataTreeChange dpnId = InterfaceUtils.getDpIdFromInterface(update); } catch (Exception e) { LOG.error("{} remove: Unable to retrieve dpnId for interface {} in subnet {}. " - + "Fetching from vpn interface itself due to exception {}", + + "Fetching from vpn interface itself", LOGGING_PREFIX, update.getName(), subnetId, e); } InstanceIdentifier id = VpnUtil diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java index 7eb7a20796..fb733562f9 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java @@ -143,8 +143,8 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { if (elanTag == 0L) { VpnManagerCounters.subnet_route_packet_failed.inc(); LOG.error("{} onPacketReceived: elanTag value from metadata found to be 0, for IPv4 " - + " Packet received with Target IP {} src Ip vpnId", LOGGING_PREFIX, dstIpStr, srcIp, - vpnId); + + " Packet received with Target IP {} src Ip {} vpnId {}", + LOGGING_PREFIX, dstIpStr, srcIp, vpnId); return; } @@ -277,7 +277,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { throws UnknownHostException { String routerId = VpnUtil.getAssociatedExternalRouter(dataBroker, srcIpStr); if (null == routerId) { - LOG.debug("The ip is not associated with any external router", srcIpStr); + LOG.debug("This ip is not associated with any external router: {}", srcIpStr); } handlePacketToExternalNetwork(new Uuid(vpnIdVpnInstanceName), routerId, dstIp, elanTag); } @@ -333,7 +333,8 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { Optional optionalNetworkMap = VpnUtil.read(broker, LogicalDatastoreType.CONFIGURATION, VpnUtil.buildNetworkMapIdentifier(new Uuid(elanInfo.getName()))); if (!optionalNetworkMap.isPresent()) { - LOG.debug("{} getTargetDpnForPacketOut: No network map found for elan info {}", elanInfo.getName()); + LOG.debug("{} getTargetDpnForPacketOut: No network map found for elan info {}", LOGGING_PREFIX, + elanInfo.getName()); return null; } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java index 1c52b40ca7..3b84424c45 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelEndPointChangeListener.java @@ -84,8 +84,7 @@ public class TunnelEndPointChangeListener List vpnInstances = VpnHelper.getAllVpnInstances(broker); if (vpnInstances == null || vpnInstances.isEmpty()) { - LOG.warn("add: dpnId: {}: tep: tep.getInterfaceName(): No VPN instances defined", - dpnId, tep.getInterfaceName()); + LOG.warn("add: dpnId: {}: tep: {}: No VPN instances defined", dpnId, tep.getInterfaceName()); return; } @@ -125,8 +124,8 @@ public class TunnelEndPointChangeListener } } } else { - LOG.error("add: Ignoring addition of tunnel interface{} dpn {} for vpnInstance {} with primaryRd {}," - + " as the VPN is already marked for deletion", tep.getInterfaceName(), + LOG.error("add: Ignoring addition of tunnel interface {} dpn {} for vpnInstance {} with primaryRd {}," + + " as the VPN is already marked for deletion", tep.getInterfaceName(), dpnId, vpnName, primaryRd); } } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java index 509e553b08..5c02581a1b 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java @@ -1760,7 +1760,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase adjacencies = optAdjacencies.get().getAdjacency(); if (!adjacencies.isEmpty()) { - LOG.trace("delAdjFromVpnInterface: Adjacencies are " + adjacencies); + LOG.trace("delAdjFromVpnInterface: Adjacencies are {}", adjacencies); Iterator adjIt = adjacencies.iterator(); while (adjIt.hasNext()) { Adjacency adjElem = adjIt.next(); @@ -2202,11 +2202,10 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase