[SDFAB-633][SDFAB-634][SDFAB-445] Collection of improvements for SR
Firstly, this patch deeply rewrites the load sharing of the SR instances,
before we were using an hybrid approach based on MastershipService.
With this patch we get rid of completely of the MastershipService
for any task. We just use the MastershipEvent as way to perform rerouting
if it happens near a cluster event. The aim is to make more stable the forwarding,
and the phased recovery.
Then, the patch contains a fix for an issue related to the phased recovery.
pr.init() can be called when there are still no masters (on device config
for example) and when this happens the portstate commands are dropped.
Last but not least, there is a fix for missing device routes in DefaultRoutingHandler.
Device routes (seenBeforeRoutes) are cleaned on DEVICE UP/ADDED events, this can lead
to purge some routes when the device events are handled in different moments by the
ONOS instances and there already some programmed routes.
Change-Id: Ia03b7c7c5b8a1b80c4b6d17053c2e2e7abf13d17
diff --git a/impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
index 5e29dde..80666c5 100644
--- a/impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
+++ b/impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
@@ -1382,8 +1382,8 @@
return;
}
- if (request && !srManager.mastershipService.isLocalMaster(deviceId)) {
- log.debug("Not installing port-IP punts - not the master for dev:{} ",
+ if (request && !srManager.shouldProgram(deviceId)) {
+ log.debug("Not installing port-IP punts - not handling programming for dev:{} ",
deviceId);
return;
}
@@ -1468,8 +1468,8 @@
*/
void populateArpNdpPunts(DeviceId deviceId) {
// We are not the master just skip.
- if (!srManager.mastershipService.isLocalMaster(deviceId)) {
- log.debug("Not installing ARP/NDP punts - not the master for dev:{} ",
+ if (!srManager.shouldProgram(deviceId)) {
+ log.debug("Not installing ARP/NDP punts - not handling programming for dev:{} ",
deviceId);
return;
}
@@ -1967,7 +1967,7 @@
void updateSpecialVlanFilteringRules(boolean pushVlan, VlanId oldVlanId,
VlanId newVlanId) {
for (Device dev : srManager.deviceService.getAvailableDevices()) {
- if (srManager.mastershipService.isLocalMaster(dev.id())) {
+ if (srManager.shouldProgram(dev.id())) {
for (Port p : srManager.deviceService.getPorts(dev.id())) {
if (!hasIPConfiguration(new ConnectPoint(dev.id(), p.number()))
&& p.isEnabled()) {