Fix for link flapping problem caused by commit 121a0243.
Ports were removed from the maintenance queue which sometimes caused BDDP
packets not to be sent. This meant links timed out and we observed link
flapping.
Change-Id: I2cb27f787bb5424002a426edf74348b9d01f0453
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
index b94c30c..279e4c3 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -989,9 +989,13 @@
NodePortTuple nptSrc = new NodePortTuple(lt.getSrc(), lt.getSrcPort());
NodePortTuple nptDst = new NodePortTuple(lt.getDst(), lt.getDstPort());
removeFromQuarantineQueue(nptSrc);
- removeFromMaintenanceQueue(nptSrc);
removeFromQuarantineQueue(nptDst);
- removeFromMaintenanceQueue(nptDst);
+
+ // XXX ONOS: Don't remove the port from the maintenance queue here
+ // because it sometimes prevents BDDPs from being sent and causes
+ // links to flap
+ // removeFromMaintenanceQueue(nptSrc);
+ // removeFromMaintenanceQueue(nptDst);
// Consume this message
return Command.STOP;