commit 34f1e3827c3e678d47d0a890ba039a915e75f00a
author Jonathan Hart <jono@onlab.us> Tue Feb 24 16:52:23 2015 -0800
committer Jonathan Hart <jono@onlab.us> Thu Feb 26 00:11:57 2015 +0000
tree b3588fd440307a9db9265ffba9ad457f35c3721d
parent 5961051006fc7a9feea2c6d07944717979c381a9

Add intents -p commmand to have some visibility into the pending map

Change-Id: Ic29460d8bf78f185bbfa426bc0aeef309b22cf7f

core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java
index 446f96b..23b2dfc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/AntiEntropyAdvertisement.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.store.ecmap;
 
+import com.google.common.base.MoreObjects;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.Timestamp;
 
@@ -80,4 +81,12 @@
         this.timestamps = null;
         this.tombstones = null;
     }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(getClass())
+                .add("timestampsSize", timestamps.size())
+                .add("tombstonesSize", tombstones.size())
+                .toString();
+    }
 }

core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index 9b38f44..cdb5bf3 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -32,12 +32,12 @@
 import org.onosproject.net.intent.Key;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.MultiValuedTimestamp;
-import org.onosproject.store.impl.SystemClockTimestamp;
 import org.onosproject.store.ecmap.EventuallyConsistentMap;
 import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
 import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
 import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
+import org.onosproject.store.impl.MultiValuedTimestamp;
+import org.onosproject.store.impl.SystemClockTimestamp;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
 
@@ -237,7 +237,7 @@
             // if current.put succeeded
             pending.remove(newData.key(), newData);
         } else {
-            log.debug("not writing update: {}", newData);
+            log.debug("not writing update: current {}, new {}", currentData, newData);
         }
         /*try {
             notifyDelegate(IntentEvent.getEvent(newData));
@@ -280,6 +280,13 @@
         return partitionService.isMine(intentKey);
     }
 
+    @Override
+    public Iterable<Intent> getPending() {
+        return pending.values().stream()
+                .map(IntentData::intent)
+                .collect(Collectors.toList());
+    }
+
     private void notifyDelegateIfNotNull(IntentEvent event) {
         if (event != null) {
             notifyDelegate(event);
@@ -310,6 +317,7 @@
                 // some work.
                 if (isMaster(event.value().intent().key())) {
                     if (delegate != null) {
+                        log.debug("processing {}", event.key());
                         delegate.process(copyData(event.value()));
                     }
                 }