X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FMultipartMessageManager.java;h=425a44946e064c97b44d27f42fdcdc8b1e2b9bc9;hp=6f58708e1b207edf898f606448147119ec3e106b;hb=721b580748cb93b3dac952ff1f111d0ab0da0c79;hpb=065ef4acddbae75329e75562c533120d2d615efe 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 6f58708e1b..425a44946e 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,63 +7,54 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.Date; import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.MultipartTransactionAware; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionAware; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; + +import com.google.common.base.Preconditions; /** - * 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 { - +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 txIdToRequestTypeMap = new ConcurrentHashMap(); + private final Map 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 txIdTotableIdMap = new ConcurrentHashMap(); - - private final int NUMBER_OF_WAIT_CYCLES =2; + private final Map txIdTotableIdMap = new ConcurrentHashMap<>(); + private final long lifetimeNanos; - class TxIdEntry{ + public MultipartMessageManager(long lifetimeNanos) { + this.lifetimeNanos = lifetimeNanos; + } + + 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){ + + public TxIdEntry(TransactionId txId) { 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 + getOuterType().hashCode(); - result = prime * result + ((nodeId == null) ? 0 : nodeId.hashCode()); result = prime * result + ((txId == null) ? 0 : txId.hashCode()); return result; } @@ -79,16 +70,7 @@ public class MultipartMessageManager { return false; } TxIdEntry other = (TxIdEntry) obj; - if (!getOuterType().equals(other.getOuterType())) { - return false; - } - 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; @@ -98,75 +80,74 @@ public class MultipartMessageManager { } return true; } - private MultipartMessageManager getOuterType() { - return MultipartMessageManager.this; - } + @Override public String toString() { - return "TxIdEntry [txId=" + txId + ", nodeId=" + nodeId + ", requestType=" + requestType + "]"; + return "TxIdEntry [txId=" + txId + ']'; } } - public MultipartMessageManager(){} - - public Short getTableIdForTxId(NodeId nodeId,TransactionId id){ - - return txIdTotableIdMap.get(new TxIdEntry(nodeId,id,null)); - - } - - public void setTxIdAndTableIdMapEntry(NodeId nodeId, TransactionId id,Short tableId){ - if(id == null) - return; - txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), tableId); + public void recordExpectedTableTransaction(TransactionId id, Short tableId) { + recordExpectedTransaction(id); + txIdTotableIdMap.put(new TxIdEntry(id), Preconditions.checkNotNull(tableId)); } - - 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?false:true; + + public Short isExpectedTableTransaction(TransactionAware transaction) { + Boolean more = null; + if (transaction instanceof MultipartTransactionAware) { + more = ((MultipartTransactionAware)transaction).isMoreReplies(); + } + + if (!isExpectedTransaction(transaction, more)) { + return null; + } + + final TxIdEntry key = new TxIdEntry(transaction.getTransactionId()); + if (more != null && more.booleanValue()) { + return txIdTotableIdMap.get(key); + } else { + return txIdTotableIdMap.remove(key); } } - public void addTxIdToRequestTypeEntry (NodeId nodeId, TransactionId id,StatsRequestType type){ - if(id == null) - return; - TxIdEntry entry = new TxIdEntry(nodeId,id,type); + + public void recordExpectedTransaction(TransactionId id) { + TxIdEntry entry = new TxIdEntry(Preconditions.checkNotNull(id)); txIdToRequestTypeMap.put(entry, getExpiryTime()); } - public boolean removeTxId(NodeId nodeId, TransactionId id){ - TxIdEntry entry = new TxIdEntry(nodeId,id,null); - return txIdToRequestTypeMap.remove(entry)==null?false:true; + + private boolean isExpectedTransaction(TransactionAware transaction, Boolean more) { + final TxIdEntry entry = new TxIdEntry(transaction.getTransactionId()); + if (more != null && more.booleanValue()) { + return txIdToRequestTypeMap.containsKey(entry); + } else { + return txIdToRequestTypeMap.remove(entry) != null; + } } - - private Date getExpiryTime(){ - Date expires = new Date(); - expires.setTime(expires.getTime()+StatisticsProvider.STATS_THREAD_EXECUTION_TIME*NUMBER_OF_WAIT_CYCLES); - return expires; + + public boolean isExpectedTransaction(TransactionAware transaction) { + Boolean more = null; + if (transaction instanceof MultipartTransactionAware) { + more = ((MultipartTransactionAware)transaction).isMoreReplies(); + } + + return isExpectedTransaction(transaction, more); } - public enum StatsRequestType{ - ALL_FLOW, - AGGR_FLOW, - ALL_PORT, - ALL_FLOW_TABLE, - ALL_QUEUE_STATS, - ALL_GROUP, - ALL_METER, - GROUP_DESC, - METER_CONFIG + private Long getExpiryTime() { + return System.nanoTime() + lifetimeNanos; } - - public void cleanStaleTransactionIds(){ + + public void cleanStaleTransactionIds() { + final long now = System.nanoTime(); + for (Iterator it = txIdToRequestTypeMap.keySet().iterator();it.hasNext();){ TxIdEntry txIdEntry = it.next(); - Date now = new Date(); - Date expiryTime = txIdToRequestTypeMap.get(txIdEntry); - if(now.after(expiryTime)){ + + Long expiryTime = txIdToRequestTypeMap.get(txIdEntry); + if(now > expiryTime){ it.remove(); txIdTotableIdMap.remove(txIdEntry); - } + } } } }