BUG-2049: DataStore failure in StatisticsManager

!WORKAROUND ONLY

- during node reconciliation statsManager could join together 2 similar
  sets of statistics notifications and hit duplicate values during
  processing - here we just skip those duplicates in order not to loose
  stats working thread and finish actual multipart

Change-Id: I526ab5439055ac565bfaa08e84e5043e8764846a
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/StatListenCommitFlow.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/StatListenCommitFlow.java
index c5aefcbf9673087a21de9f3f1677b4976d74b77d..e54fcc6fa2100cb21af3c41b0f78fc9bb51a872c 100644 (file)
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/StatListenCommitFlow.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/impl/StatListenCommitFlow.java
@@ -82,7 +82,7 @@ import com.google.common.collect.HashBiMap;
 public class StatListenCommitFlow extends StatAbstractListenCommit<Flow, OpendaylightFlowStatisticsListener>
                                             implements OpendaylightFlowStatisticsListener {
 
-    private static final Logger LOG = LoggerFactory.getLogger(StatListenCommitFlow.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(StatListenCommitFlow.class);
 
     private static final String ALIEN_SYSTEM_FLOW_ID = "#UF$TABLE*";
 
@@ -302,7 +302,11 @@ public class StatListenCommitFlow extends StatAbstractListenCommit<Flow, Openday
                     final List<FlowHashIdMap>  flowHashMap = flowHashMapping.getFlowHashIdMap() != null
                             ? flowHashMapping.getFlowHashIdMap() : Collections.<FlowHashIdMap> emptyList();
                     for (final FlowHashIdMap flowHashId : flowHashMap) {
-                        flowIdByHash.put(flowHashId.getKey(), flowHashId.getFlowId());
+                        try {
+                            flowIdByHash.put(flowHashId.getKey(), flowHashId.getFlowId());
+                        } catch (Exception e) {
+                            LOG.warn("flow hashing hit a duplicate for {} -> {}", flowHashId.getKey(), flowHashId.getFlowId());
+                        }
                     }
                 }
             }