Disabling the installation of LLDP Punt rules to Controller.

In a multi-node devstack setup, LLDP installation seems to cause issues with the Controller
(CPU spike and some OF message timeouts). It is better to debug that and once we have an idea,
we can enable it again. There is NO functional impact to the Neutron integration with OVSDB
by disabling LLDP flow installation.

Change-Id: I51e64253e09b6e863e2eea89f2570e436d3cc93f
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index 55b1eb9b285e18ff29132935c4665587da8a7d29..8c58157f015613b4c453572a8b0e46308f265954 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@ -199,9 +199,17 @@ public class InternalNetworkManager {
             }
         }
 
-        this.initializeLLDPFlowRules(node, AdminConfigManager.getManager().getTunnelBridgeName());
         this.initializeOFNormalFlowRules(node, AdminConfigManager.getManager().getIntegrationBridgeName());
+        /*
+         * Disabling LLDP Punt rules to Controller for now.
+         * In a multi-node setup, it seems to cause issues with the Controller (CPU spike and some OF message timeouts).
+         * It is better to debug that and once we have an idea, we can enable this.
+         * There is NO functional impact to the Neutron integration with OVSDB by disabling LLDP flow installation.
+         */
+        /*
+        this.initializeLLDPFlowRules(node, AdminConfigManager.getManager().getTunnelBridgeName());
         this.initializeLLDPFlowRules(node, AdminConfigManager.getManager().getIntegrationBridgeName());
+        */
     }
 
     private void initializeOFNormalFlowRules(Node node, String bridgeName) {