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=0ce551a17c5f4f0ab94577f863abc4f09d2339ac;hp=6f58708e1b207edf898f606448147119ec3e106b;hb=c02e660d9121e93f35f99c773c1ba1a0a40513f7;hpb=07c30f447bd1366ba18e6f0f41ac768a16dbc901 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..0ce551a17c 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,54 +7,49 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.Date; +import java.util.HashMap; 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.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 { + private static final int NUMBER_OF_WAIT_CYCLES = 2; /* - * 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 HashMap<>(); /* * 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 HashMap<>(); - class TxIdEntry{ - private final TransactionId txId; - private final NodeId nodeId; + private static final class TxIdEntry { private final StatsRequestType requestType; - - public TxIdEntry(NodeId nodeId, TransactionId txId, StatsRequestType requestType){ + private final TransactionId txId; + + public TxIdEntry(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; } @@ -62,8 +57,6 @@ public class MultipartMessageManager { 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 +72,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,52 +82,48 @@ 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 + ", requestType=" + requestType + "]"; } } - public MultipartMessageManager(){} - - public Short getTableIdForTxId(NodeId nodeId,TransactionId id){ - - return txIdTotableIdMap.get(new TxIdEntry(nodeId,id,null)); - + public void recordExpectedTableTransaction(TransactionId id, StatsRequestType type, Short tableId) { + recordExpectedTransaction(id, type); + txIdTotableIdMap.put(new TxIdEntry(id, null), Preconditions.checkNotNull(tableId)); } - - public void setTxIdAndTableIdMapEntry(NodeId nodeId, TransactionId id,Short tableId){ - if(id == null) - return; - txIdTotableIdMap.put(new TxIdEntry(nodeId,id,null), 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) { + if (!isExpectedTransaction(transaction, more)) { + return null; + } + + final TxIdEntry key = new TxIdEntry(transaction.getTransactionId(), null); + 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, StatsRequestType type) { + TxIdEntry entry = new TxIdEntry(Preconditions.checkNotNull(id), Preconditions.checkNotNull(type)); 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; + + public boolean isExpectedTransaction(TransactionAware transaction, Boolean more) { + TxIdEntry entry = new TxIdEntry(transaction.getTransactionId(), null); + 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; + + private static Long getExpiryTime(){ + return System.nanoTime() + TimeUnit.MILLISECONDS.toNanos( + StatisticsProvider.STATS_COLLECTION_MILLIS*NUMBER_OF_WAIT_CYCLES); } public enum StatsRequestType{ @@ -157,16 +137,18 @@ public class MultipartMessageManager { GROUP_DESC, METER_CONFIG } - + 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); - } + } } } }