Merge "bug 741 - Make sure to stop threads on bundle stop on TopologyServiceShim"

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
index fc668b3f4d0f1a1f01bb3a9b096b6bc7440515c0..1a59a325adf6f6b71e03d4e68077921657f6813e 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java
@@ -148,7 +148,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa
                         Thread.sleep(10);
                     }
                 } catch (InterruptedException e1) {
-                    logger.warn("DiscoveryTransmit interupted", e1.getMessage());
+                    logger.trace("DiscoveryTransmit interupted", e1.getMessage());
                     if (shuttingDown) {
                         return;
                     }

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
index dacc130831ff18332adff071d400621096e8b48b..08ddbde30af11d3551447e9cb03f05a405e35887 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
@@ -141,7 +141,7 @@ public class TopologyServiceShim implements IDiscoveryListener,
 
                     Thread.sleep(100);
                 } catch (InterruptedException e1) {
-                    logger.warn("TopologyNotify interrupted {}",
+                    logger.trace("TopologyNotify interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
                         return;
@@ -200,7 +200,7 @@ public class TopologyServiceShim implements IDiscoveryListener,
                         }
                     }
                 } catch (InterruptedException e1) {
-                    logger.warn(
+                    logger.trace(
                             "Edge Bandwidth Utilization Notify Thread interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
@@ -235,10 +235,9 @@ public class TopologyServiceShim implements IDiscoveryListener,
                         logger.debug("Bulk Notify container:{}", containerName);
                         TopologyBulkUpdate(containerName);
                     } catch (InterruptedException e) {
-                        logger.warn("Topology Bulk update thread interrupted");
+                        logger.trace("Topology Bulk update thread interrupted");
                         if (shuttingDown) {
-                            return;
-                        }
+                            return;                        }
                     }
                 }
             }
@@ -265,6 +264,10 @@ public class TopologyServiceShim implements IDiscoveryListener,
     protected void pollTxBitRates() {
         Map<NodeConnector, Pair<Edge, Set<Property>>> globalContainerEdges = edgeMap
                 .get(GlobalConstants.DEFAULT.toString());
+        if (shuttingDown) {
+            logger.trace("Getting out the pollTxBitRates because bundle going down");
+            return;
+        }
         if (globalContainerEdges == null) {
             return;
         }
@@ -357,6 +360,9 @@ public class TopologyServiceShim implements IDiscoveryListener,
         logger.trace("STOP called!");
         shuttingDown = true;
         notifyThread.interrupt();
+        bwUtilNotifyThread.interrupt();
+        ofPluginTopoBulkUpdate.interrupt();
+        pollTimer.cancel();
     }
 
     void setTopologyServiceShimListener(Map<?, ?> props,