X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FMultipartMessageManager.java;h=02b397e78f15875d3ce6cd18ba62a86219d77ebf;hb=refs%2Fchanges%2F99%2F5299%2F4;hp=998d5d8faaf24fd09e10d6a5865f1a5c169e6d96;hpb=9212fed678702583f4a555641208cf1c7b45b829;p=controller.git

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
index 998d5d8faa..02b397e78f 100644
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MultipartMessageManager.java
@@ -7,52 +7,131 @@
  */
 package org.opendaylight.controller.md.statistics.manager;
 
+import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 
 /**
- * Main responsibility of the class is to manage multipart response 
+ * Main responsibility of the class is to manage multipart response
  * for multipart request. It also handles the flow aggregate request
- * and response mapping. 
+ * and response mapping.
  * @author avishnoi@in.ibm.com
  *
  */
 public class MultipartMessageManager {
 
     /*
-     *  Map for tx id and type of request, to keep track of all the request sent 
-     *  by Statistics Manager. Statistics Manager won't entertain any multipart 
-     *  response for which it didn't send the request.  
+     *  Map for tx id and type of request, to keep track of all the request sent
+     *  by Statistics Manager. Statistics Manager won't entertain any multipart
+     *  response for which it didn't send the request.
      */
-    
-    private static Map<TransactionId,StatsRequestType> txIdToRequestTypeMap = new ConcurrentHashMap<TransactionId,StatsRequestType>();
+    private final Map<TxIdEntry,Long> txIdToRequestTypeMap = new ConcurrentHashMap<>();
     /*
      * Map to keep track of the request tx id for flow table statistics request.
      * Because flow table statistics multi part response do not contains the table id.
      */
-    private static Map<TransactionId,Short> txIdTotableIdMap = new ConcurrentHashMap<TransactionId,Short>();
-    
-    public MultipartMessageManager(){}
-    
-    public Short getTableIdForTxId(TransactionId id){
-        
-        return txIdTotableIdMap.get(id);
-        
+    private final Map<TxIdEntry,Short> txIdTotableIdMap = new ConcurrentHashMap<>();
+
+    private static final int NUMBER_OF_WAIT_CYCLES =2;
+
+    private static final class TxIdEntry {
+        private final TransactionId txId;
+        private final NodeId nodeId;
+        private final StatsRequestType requestType;
+
+        public TxIdEntry(NodeId nodeId, TransactionId txId, StatsRequestType requestType){
+            this.txId = txId;
+            this.nodeId = nodeId;
+            this.requestType = requestType;
+        }
+        public TransactionId getTxId() {
+            return txId;
+        }
+        public NodeId getNodeId() {
+            return nodeId;
+        }
+        public StatsRequestType getRequestType() {
+            return requestType;
+        }
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode());
+            result = prime * result + ((txId == null) ? 0 : txId.hashCode());
+            return result;
+        }
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (!(obj instanceof TxIdEntry)) {
+                return false;
+            }
+            TxIdEntry other = (TxIdEntry) obj;
+
+            if (nodeId == null) {
+                if (other.nodeId != null) {
+                    return false;
+                }
+            } else if (!nodeId.equals(other.nodeId)) {
+                return false;
+            }
+            if (txId == null) {
+                if (other.txId != null) {
+                    return false;
+                }
+            } else if (!txId.equals(other.txId)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "TxIdEntry [txId=" + txId + ", nodeId=" + nodeId + ", requestType=" + requestType + "]";
+        }
     }
-    
-    public void setTxIdAndTableIdMapEntry(TransactionId id,Short tableId){
-        txIdTotableIdMap.put(id, tableId);
+
+    public Short getTableIdForTxId(NodeId nodeId,TransactionId id){
+        return txIdTotableIdMap.get(new TxIdEntry(nodeId,id,null));
     }
-    
-    public void addTxIdToRequestTypeEntry (TransactionId id,StatsRequestType type){
-        txIdToRequestTypeMap.put(id, type);
+
+    public void setTxIdAndTableIdMapEntry(NodeId nodeId, TransactionId id,Short tableId){
+        if(id == null)
+            return;
+        txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), tableId);
     }
-    public StatsRequestType removeTxId(TransactionId id){
-        return txIdToRequestTypeMap.remove(id);
+
+    public boolean isRequestTxIdExist(NodeId nodeId, TransactionId id, Boolean moreRepliesToFollow){
+        TxIdEntry entry = new TxIdEntry(nodeId,id,null);
+        if(moreRepliesToFollow.booleanValue()){
+            return txIdToRequestTypeMap.containsKey(entry);
+        }else{
+            return txIdToRequestTypeMap.remove(entry) != null;
+        }
     }
-    
+
+    public void addTxIdToRequestTypeEntry (NodeId nodeId, TransactionId id,StatsRequestType type){
+        if(id == null)
+            return;
+        TxIdEntry entry = new TxIdEntry(nodeId,id,type);
+        txIdToRequestTypeMap.put(entry, getExpiryTime());
+    }
+
+    private static Long getExpiryTime(){
+        return System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(
+                StatisticsProvider.STATS_THREAD_EXECUTION_TIME*NUMBER_OF_WAIT_CYCLES);
+    }
+
     public enum StatsRequestType{
         ALL_FLOW,
         AGGR_FLOW,
@@ -64,4 +143,18 @@ public class MultipartMessageManager {
         GROUP_DESC,
         METER_CONFIG
     }
+
+    public void cleanStaleTransactionIds(){
+        final long now = System.nanoTime();
+
+        for (Iterator<TxIdEntry> it = txIdToRequestTypeMap.keySet().iterator();it.hasNext();){
+            TxIdEntry txIdEntry = it.next();
+
+            Long expiryTime = txIdToRequestTypeMap.get(txIdEntry);
+            if(now > expiryTime){
+                it.remove();
+                txIdTotableIdMap.remove(txIdEntry);
+            }
+        }
+    }
 }