CORD-1583 Bug fixes for dual ToRs
Two things:
- In dual (paired) ToR scenarios it is possible to have the same outport
in multiple buckets in a hash group, as long as they have different labels.
When adding buckets this was taken into account. But when removing buckets,
only outport was being checked. This bug fix ensures that labels are checked
as well when removing buckets.
- In dual ToR scenarios, getting the right set of hash buckets proved difficult
with existing 'retryHash' mechanism. Repealed and replaced with a bucket corrector
mechanism that periodically corrects the hash group buckets when the topology
has been stable for the last 10 secs. Required the introduction of a VERIFY
operation in Next Objectives. Also added a cli command to trigger this
operation manually.
Change-Id: Ib0d2734060fadc6e7a4bd0d75f3409e194413a97
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 12c52bf..071fe3e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -522,6 +522,14 @@
}
}
+ @Override
+ public void verifyGroups(DeviceId id) {
+ DefaultGroupHandler gh = groupHandlerMap.get(id);
+ if (gh != null) {
+ gh.triggerBucketCorrector();
+ }
+ }
+
/**
* Extracts the application ID from the manager.
*
@@ -761,6 +769,15 @@
}
/**
+ * Returns the default routing handler object.
+ *
+ * @return the default routing handler object
+ */
+ public DefaultRoutingHandler getRoutingHandler() {
+ return defaultRoutingHandler;
+ }
+
+ /**
* Returns true if this controller instance has seen this link before. The
* link may not be currently up, but as long as the link had been seen before
* this method will return true. The one exception is when the link was
@@ -1249,7 +1266,10 @@
seenLinks.keySet().removeIf(key -> key.src().deviceId().equals(device.id()) ||
key.dst().deviceId().equals(device.id()));
- groupHandlerMap.remove(device.id());
+ DefaultGroupHandler gh = groupHandlerMap.remove(device.id());
+ if (gh != null) {
+ gh.shutdown();
+ }
defaultRoutingHandler.purgeEcmpGraph(device.id());
// Note that a switch going down is associated with all of its links
// going down as well, but it is treated as a single switch down event