Merge "Bug 4957 RoleContext updated with initialization"

[openflowplugin.git] / applications / inventory-manager / src / main / java / org / opendaylight / openflowplugin / applications / inventory / manager / NodeChangeCommiter.java

diff --git a/applications/inventory-manager/src/main/java/org/opendaylight/openflowplugin/applications/inventory/manager/NodeChangeCommiter.java b/applications/inventory-manager/src/main/java/org/opendaylight/openflowplugin/applications/inventory/manager/NodeChangeCommiter.java
index 0c37e76b7e7dc4432746fdb0f53734c0d794e7cc..35b6b3d717dc345e93926e33198820587f74607d 100644 (file)
--- a/applications/inventory-manager/src/main/java/org/opendaylight/openflowplugin/applications/inventory/manager/NodeChangeCommiter.java
+++ b/applications/inventory-manager/src/main/java/org/opendaylight/openflowplugin/applications/inventory/manager/NodeChangeCommiter.java
@@ -9,9 +9,12 @@ package org.opendaylight.openflowplugin.applications.inventory.manager;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
@@ -21,13 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.OpendaylightInventoryListener;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.*;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
@@ -42,13 +39,33 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
 
     private final FlowCapableInventoryProvider manager;
 
+    // cache for nodes which were deleted, we get more than one nodeRemoved notification
+    private Cache<NodeRef, Boolean> deletedNodeCache =
+            CacheBuilder.newBuilder().maximumSize(10000).expireAfterWrite(10, TimeUnit.SECONDS).build();
+
+    // cache for node-connectors which were deleted, we get more than one nodeConnectorRemoved notification
+    private Cache<NodeConnectorRef, Boolean> deletedNodeConnectorCache =
+            CacheBuilder.newBuilder().maximumSize(1000000).expireAfterWrite(10, TimeUnit.SECONDS).build();
+
     public NodeChangeCommiter(final FlowCapableInventoryProvider manager) {
         this.manager = Preconditions.checkNotNull(manager);
     }
 
     @Override
     public synchronized void onNodeConnectorRemoved(final NodeConnectorRemoved connector) {
-        LOG.debug("Node connector removed notification received.");
+        if(deletedNodeConnectorCache.getIfPresent(connector.getNodeConnectorRef()) == null){
+            deletedNodeConnectorCache.put(connector.getNodeConnectorRef(), Boolean.TRUE);
+        } else {
+            //its been noted that creating an operation for already removed node-connectors, fails
+            // the entire transaction chain, there by failing deserving removals
+            LOG.debug("Already received notification to remove nodeConnector, {} - Ignored",
+                    connector.getNodeConnectorRef().getValue());
+            return;
+        }
+
+        if(!manager.deviceDataDeleteAllowed(getNodeId(connector.getNodeConnectorRef().getValue()))) { return; }
+
+        LOG.debug("Node connector removed notification received, {}", connector.getNodeConnectorRef().getValue());
         manager.enqueue(new InventoryOperation() {
             @Override
             public void applyOperation(final ReadWriteTransaction tx) {
@@ -61,6 +78,10 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
 
     @Override
     public synchronized void onNodeConnectorUpdated(final NodeConnectorUpdated connector) {
+        if (deletedNodeConnectorCache.getIfPresent(connector.getNodeConnectorRef()) != null){
+            deletedNodeConnectorCache.invalidate(connector.getNodeConnectorRef());
+        }
+
         LOG.debug("Node connector updated notification received.");
         manager.enqueue(new InventoryOperation() {
             @Override
@@ -85,7 +106,20 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
 
     @Override
     public synchronized void onNodeRemoved(final NodeRemoved node) {
-        LOG.debug("Node removed notification received.");
+
+        if(deletedNodeCache.getIfPresent(node.getNodeRef()) == null){
+            deletedNodeCache.put(node.getNodeRef(), Boolean.TRUE);
+        } else {
+            //its been noted that creating an operation for already removed node, fails
+            // the entire transaction chain, there by failing deserving removals
+            LOG.debug("Already received notification to remove node, {} - Ignored",
+                    node.getNodeRef().getValue());
+            return;
+        }
+
+        if(!manager.deviceDataDeleteAllowed(getNodeId(node.getNodeRef().getValue()))) { return; }
+
+        LOG.debug("Node removed notification received, {}", node.getNodeRef().getValue());
         manager.enqueue(new InventoryOperation() {
             @Override
             public void applyOperation(final ReadWriteTransaction tx) {
@@ -98,11 +132,15 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
 
     @Override
     public synchronized void onNodeUpdated(final NodeUpdated node) {
+        if (deletedNodeCache.getIfPresent(node.getNodeRef()) != null){
+            deletedNodeCache.invalidate(node.getNodeRef());
+        }
+
         final FlowCapableNodeUpdated flowNode = node.getAugmentation(FlowCapableNodeUpdated.class);
         if (flowNode == null) {
             return;
         }
-        LOG.debug("Node updated notification received.");
+        LOG.debug("Node updated notification received,{}", node.getNodeRef().getValue());
         manager.enqueue(new InventoryOperation() {
             @Override
             public void applyOperation(ReadWriteTransaction tx) {
@@ -153,8 +191,12 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
                 TableBuilder tableBuilder = new TableBuilder();
                 Table table0 = tableBuilder.setId((short) 0).build();
                 LOG.debug("writing table :{} ", tableIdentifier);
-                tx.put(LogicalDatastoreType.OPERATIONAL, tableIdentifier, table0, true);
+                tx.merge(LogicalDatastoreType.OPERATIONAL, tableIdentifier, table0, true);
             }
         });
     }
+
+    private NodeId getNodeId(InstanceIdentifier<?> iid) {
+        return iid.firstKeyOf(Node.class).getId();
+    }
 }