Read dpn ids from cache instead of reading DS

Description : It was observed that Dhcp is reading the entire
operational inventory-node datastore to get the list of dpn ids, which
is taking longer time.

Here fix is to cache dpn ids when nodes get connected and use the same.

Change-Id: Icd0040a5aa94f2be7db416231d715ae638386f56
Signed-off-by: Ankit Jain <ankit.j.jain@ericsson.com>

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNodeListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNodeListener.java
new file mode 100644 (file)
index 0000000..d6751d6
--- /dev/null
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNodeListener.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2018 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.netvirt.dhcpservice;
+
+import java.math.BigInteger;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+public class DhcpNodeListener extends AsyncClusteredDataTreeChangeListenerBase<Node, DhcpNodeListener> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DhcpNodeListener.class);
+    private final DataBroker broker;
+
+    @Inject
+    public DhcpNodeListener(DataBroker broker) {
+        super(Node.class, DhcpNodeListener.class);
+        this.broker = broker;
+    }
+
+    @PostConstruct
+    public void start() {
+        registerListener(LogicalDatastoreType.OPERATIONAL, broker);
+    }
+
+    @Override
+    public void close() {
+        super.close();
+    }
+
+    @Override
+    protected InstanceIdentifier<Node> getWildCardPath() {
+        return InstanceIdentifier.create(Nodes.class).child(Node.class);
+    }
+
+    @Override
+    protected void remove(InstanceIdentifier<Node> key, Node del) {
+        LOG.trace("Received remove for {}", del);
+        NodeId nodeId = del.getId();
+        String[] node =  nodeId.getValue().split(":");
+        if (node.length < 2) {
+            LOG.error("DhcpNodeListener: Failed to remove Unexpected nodeId {}", nodeId.getValue());
+            return;
+        }
+        BigInteger dpId = new BigInteger(node[1]);
+        DhcpServiceUtils.removeFromDpnIdCache(dpId);
+    }
+
+    @Override
+    protected void update(InstanceIdentifier<Node> key, Node dataObjectModificationBefore,
+            Node dataObjectModificationAfter) {
+    }
+
+    @Override
+    protected void add(InstanceIdentifier<Node> key, Node add) {
+        LOG.trace("Received add for {}", add);
+        NodeId nodeId = add.getId();
+        String[] node =  nodeId.getValue().split(":");
+        if (node.length < 2) {
+            LOG.error("DhcpNodeListener: Failed to add Unexpected nodeId {}", nodeId.getValue());
+            return;
+        }
+        BigInteger dpId = new BigInteger(node[1]);
+        DhcpServiceUtils.addToDpnIdCache(dpId);
+    }
+
+    @Override
+    protected DhcpNodeListener getDataTreeChangeListener() {
+        return DhcpNodeListener.this;
+    }
+
+}

diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
index 153518709b3bad1e207723689fc7f5476f78dd91..bedc427beebaa0724457b4a0eb2f98f7d9666c9a 100644 (file)
--- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
+++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java
@@ -20,6 +20,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -116,6 +117,7 @@ import org.slf4j.LoggerFactory;
 public final class DhcpServiceUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(DhcpServiceUtils.class);
+    private static List<BigInteger> connectedDpnIds = new CopyOnWriteArrayList<>();
 
     private DhcpServiceUtils() { }
 
@@ -254,12 +256,18 @@ public final class DhcpServiceUtils {
     }
 
     public static List<BigInteger> getListOfDpns(DataBroker broker) {
+        if (!connectedDpnIds.isEmpty()) {
+            return connectedDpnIds;
+        }
         return extractDpnsFromNodes(MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL,
                 InstanceIdentifier.builder(Nodes.class).build()));
     }
 
     @Nonnull
     public static List<BigInteger> getListOfDpns(ReadTransaction tx) throws ReadFailedException {
+        if (!connectedDpnIds.isEmpty()) {
+            return connectedDpnIds;
+        }
         return extractDpnsFromNodes(tx.read(LogicalDatastoreType.OPERATIONAL,
                 InstanceIdentifier.builder(Nodes.class).build()).checkedGet());
     }
@@ -544,5 +552,15 @@ public final class DhcpServiceUtils {
         return false;
     }
 
+    public static void addToDpnIdCache(BigInteger dpnId) {
+        if (!connectedDpnIds.contains(dpnId)) {
+            connectedDpnIds.add(dpnId);
+        }
+    }
+
+    public static void removeFromDpnIdCache(BigInteger dpnId) {
+        connectedDpnIds.remove(dpnId);
+    }
+
 }