X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Fstatistics%2Fmanager%2Fimpl%2FStatPermCollectorImpl.java;h=3a16feb242a825bc6478f35fcc2dc7276de8a5f3;hb=611180ac770b6038b526c54994701db16d1a8567;hp=61e9068d8af6d6099ec5cd00d84d91ef08cdbcc9;hpb=6bb1ecb0cdd145486f90506f68c66647eab12ac7;p=openflowplugin.git

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatPermCollectorImpl.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatPermCollectorImpl.java
index 61e9068d8a..3a16feb242 100644
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatPermCollectorImpl.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatPermCollectorImpl.java
@@ -13,7 +13,7 @@ import java.util.concurrent.ThreadFactory;
 
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId;
@@ -40,9 +40,15 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
  */
 public class StatPermCollectorImpl implements StatPermCollector {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StatPermCollectorImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StatPermCollectorImpl.class);
 
-    private final static long STAT_COLLECT_TIME_OUT = 3000L;
+    private static final long STAT_COLLECT_TIME_OUT = 3000L;
+
+    /**
+        sleep 5 second before collecting all statistics cycles is important
+        for loading all Nodes to Operational/DS
+     */
+    private static final long WAIT_BEFORE_COLLECTING_STATS = 5000;
 
     private final ExecutorService statNetCollectorServ;
     private final StatisticsManager manager;
@@ -99,26 +105,24 @@ public class StatPermCollectorImpl implements StatPermCollector {
     @Override
     public boolean connectedNodeRegistration(final InstanceIdentifier<Node> ident,
             final List<StatCapabTypes> statTypes, final Short nrOfSwitchTables) {
-        if (isNodeIdentValidForUse(ident)) {
-            if ( ! statNodeHolder.containsKey(ident)) {
-                synchronized (statNodeHolderLock) {
-                    final boolean startStatCollecting = statNodeHolder.size() == 0;
-                    if ( ! statNodeHolder.containsKey(ident)) {
-                        if (statNodeHolder.size() >= maxNodeForCollector) {
-                            return false;
-                        }
-                        final Map<InstanceIdentifier<Node>, StatNodeInfoHolder> statNode =
-                                new HashMap<>(statNodeHolder);
-                        final NodeRef nodeRef = new NodeRef(ident);
-                        final StatNodeInfoHolder nodeInfoHolder = new StatNodeInfoHolder(nodeRef,
-                                statTypes, nrOfSwitchTables);
-                        statNode.put(ident, nodeInfoHolder);
-                        statNodeHolder = Collections.unmodifiableMap(statNode);
-                    }
-                    if (startStatCollecting) {
-                        finishing = false;
-                        statNetCollectorServ.execute(this);
+        if (isNodeIdentValidForUse(ident) && ! statNodeHolder.containsKey(ident)) {
+            synchronized (statNodeHolderLock) {
+                final boolean startStatCollecting = statNodeHolder.size() == 0;
+                if ( ! statNodeHolder.containsKey(ident)) {
+                    if (statNodeHolder.size() >= maxNodeForCollector) {
+                        return false;
                     }
+                    final Map<InstanceIdentifier<Node>, StatNodeInfoHolder> statNode =
+                            new HashMap<>(statNodeHolder);
+                    final NodeRef nodeRef = new NodeRef(ident);
+                    final StatNodeInfoHolder nodeInfoHolder = new StatNodeInfoHolder(nodeRef,
+                            statTypes, nrOfSwitchTables);
+                    statNode.put(ident, nodeInfoHolder);
+                    statNodeHolder = Collections.unmodifiableMap(statNode);
+                }
+                if (startStatCollecting) {
+                    finishing = false;
+                    statNetCollectorServ.execute(this);
                 }
             }
         }
@@ -127,22 +131,20 @@ public class StatPermCollectorImpl implements StatPermCollector {
 
     @Override
     public boolean disconnectedNodeUnregistration(final InstanceIdentifier<Node> ident) {
-        if (isNodeIdentValidForUse(ident)) {
-            if (statNodeHolder.containsKey(ident)) {
-                synchronized (statNodeHolderLock) {
-                    if (statNodeHolder.containsKey(ident)) {
-                        final Map<InstanceIdentifier<Node>, StatNodeInfoHolder> statNode =
-                                new HashMap<>(statNodeHolder);
-                        statNode.remove(ident);
-                        statNodeHolder = Collections.unmodifiableMap(statNode);
-                    }
-                    if (statNodeHolder.isEmpty()) {
-                        finishing = true;
-                        collectNextStatistics(actualTransactionId);
-                        statNetCollectorServ.shutdown();
-                    }
-                    return true;
+        if (isNodeIdentValidForUse(ident) && statNodeHolder.containsKey(ident)) {
+            synchronized (statNodeHolderLock) {
+                if (statNodeHolder.containsKey(ident)) {
+                    final Map<InstanceIdentifier<Node>, StatNodeInfoHolder> statNode =
+                            new HashMap<>(statNodeHolder);
+                    statNode.remove(ident);
+                    statNodeHolder = Collections.unmodifiableMap(statNode);
                 }
+                if (statNodeHolder.isEmpty()) {
+                    finishing = true;
+                    collectNextStatistics(actualTransactionId);
+                    statNetCollectorServ.shutdown();
+                }
+                return true;
             }
         }
         return false;
@@ -177,13 +179,11 @@ public class StatPermCollectorImpl implements StatPermCollector {
 
     @Override
     public void collectNextStatistics(final TransactionId xid) {
-        if (checkTransactionId(xid)) {
-            if (wakeMe) {
-                synchronized (statCollectorLock) {
-                    if (wakeMe) {
-                        LOG.trace("STAT-COLLECTOR is notified to conntinue");
-                        statCollectorLock.notify();
-                    }
+        if (checkTransactionId(xid) && wakeMe) {
+            synchronized (statCollectorLock) {
+                if (wakeMe) {
+                    LOG.trace("STAT-COLLECTOR is notified to conntinue");
+                    statCollectorLock.notify();
                 }
             }
         }
@@ -192,9 +192,7 @@ public class StatPermCollectorImpl implements StatPermCollector {
     @Override
     public void run() {
         try {
-            // sleep 5 second before collecting all statistics cycles is important
-            // for loading all Nodes to Operational/DS
-            Thread.sleep(5000);
+            Thread.sleep(WAIT_BEFORE_COLLECTING_STATS);
         }
         catch (final InterruptedException e1) {
             // NOOP