Add more info about state being processed

Change-Id: Ic58ee7726658cb98ca96d6ec4ceeb1fcb09fc4d4
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
index 9367998e1c6e1b1df5e0dc53e104f3a233a8bf94..8a6065a562a60c8a96e286aedf9df48751bbe3ce 100644 (file)
--- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
+++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAdjRIBsIn.java
@@ -52,12 +52,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.base.Preconditions;
 
 final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination, LinkstateRoute> {
 
        private abstract static class LinkstateRIBEntryData<A extends LinkStateAttribute> extends
-                       RIBEntryData<CLinkstateDestination, LinkstateRoute> {
+       RIBEntryData<CLinkstateDestination, LinkstateRoute> {
                private final A lsattr;
 
                protected LinkstateRIBEntryData(final PathAttributes attributes, final A lsattr) {
@@ -82,6 +83,11 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
 
                        return builder.build();
                }
+
+               @Override
+               protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
+                       return toStringHelper.add("lsattr", lsattr);
+               }
        }
 
        private static final Logger LOG = LoggerFactory.getLogger(LinkstateAdjRIBsIn.class);
@@ -110,6 +116,8 @@ final class LinkstateAdjRIBsIn extends AbstractAdjRIBsIn<CLinkstateDestination,
                LOG.debug("Iterating over route destinations {}", keys);
 
                for (final CLinkstateDestination key : keys.getCLinkstateDestination()) {
+                       LOG.debug("Processing route key {}", key);
+
                        LinkStateAttribute lsattr = null;
                        final PathAttributes1 pa = attributes.getAugmentation(PathAttributes1.class);
                        if (pa != null) {

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
index c44569297a576393f364d501adf75bd69880c649..700de8c2012352249057fe9f612b347aa62762ce 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractAdjRIBsIn.java
@@ -33,6 +33,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.base.Preconditions;
 
 @ThreadSafe
@@ -49,6 +51,15 @@ public abstract class AbstractAdjRIBsIn<I, D extends DataObject> implements AdjR
                }
 
                protected abstract D getDataObject(I key);
+
+               @Override
+               public final String toString() {
+                       return addToStringAttributes(Objects.toStringHelper(this)).toString();
+               }
+
+               protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
+                       return toStringHelper.add("attributes", attributes);
+               }
        }
 
        /**
@@ -175,6 +186,8 @@ public abstract class AbstractAdjRIBsIn<I, D extends DataObject> implements AdjR
        protected abstract InstanceIdentifier<?> identifierForKey(final InstanceIdentifier<Tables> basePath, final I id);
 
        protected synchronized void add(final DataModificationTransaction trans, final Peer peer, final I id, final RIBEntryData<I, D> data) {
+               LOG.debug("Adding state {} for {} peer {}", data, id, peer);
+
                RIBEntry e = this.entries.get(Preconditions.checkNotNull(id));
                if (e == null) {
                        e = new RIBEntry(id);