mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 18:02:05 +02:00
Code Issues Projects Releases Wiki Activity

[CORD-2483] Deleting multiple sinks does not clean all flows and groups

Browse Source 
Rationale: Let's assume we have a working group with
multiple sinks. We try to delete the sinks all together,
also in this case for each sink a sink removed event is
generated. For each event we create a new next objective
removing the ports no more needed.

Solution is related to the previous patch (group editing).
Failure scenario:

Sink1 removed -> fwdObj A -> Next B

McastHandler store has been updated at this point.

Sink2 removed -> remove fwdObj A

The remove operations is executed immediately but
the Next B could not exist at this point -> flow
installation failed

Change-Id: Icf568b26b2f3ae3feb935b13038db6195125a5c4
This commit is contained in:
Pier Luigi 2018-01-19 10:24:53 +01:00 committed by Charles Chan
parent 21fffd29a4
commit d1be7b1317
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
View File

@ -581,13 +581,14 @@ public class McastHandler {
existingPorts.remove(port); existingPorts.remove(port);
NextObjective newNextObj; NextObjective newNextObj;
ObjectiveContext context;
ForwardingObjective fwdObj; ForwardingObjective fwdObj;
if (existingPorts.isEmpty()) { if (existingPorts.isEmpty()) {
// If this is the last sink, remove flows and groups // If this is the last sink, remove flows and last bucket
// NOTE: Rely on GroupStore garbage collection rather than explicitly // NOTE: Rely on GroupStore garbage collection rather than explicitly
// remove L3MG since there might be other flows/groups refer to // remove L3MG since there might be other flows/groups refer to
// the same L2IG // the same L2IG
ObjectiveContext context = new DefaultObjectiveContext( context = new DefaultObjectiveContext(
(objective) -> log.debug("Successfully remove {} on {}/{}, vlan {}", (objective) -> log.debug("Successfully remove {} on {}/{}, vlan {}",
mcastIp, deviceId, port.toLong(), assignedVlan), mcastIp, deviceId, port.toLong(), assignedVlan),
(objective, error) -> (objective, error) ->
@ -595,21 +596,25 @@ public class McastHandler {
mcastIp, deviceId, port.toLong(), assignedVlan, error)); mcastIp, deviceId, port.toLong(), assignedVlan, error));
fwdObj = fwdObjBuilder(mcastIp, assignedVlan, nextObj.id()).remove(context); fwdObj = fwdObjBuilder(mcastIp, assignedVlan, nextObj.id()).remove(context);
mcastNextObjStore.remove(mcastStoreKey); mcastNextObjStore.remove(mcastStoreKey);
srManager.flowObjectiveService.forward(deviceId, fwdObj);
} else { } else {
// If this is not the last sink, update flows and groups // If this is not the last sink, update flows and groups
ObjectiveContext context = new DefaultObjectiveContext( context = new DefaultObjectiveContext(
(objective) -> log.debug("Successfully update {} on {}/{}, vlan {}", (objective) -> log.debug("Successfully update {} on {}/{}, vlan {}",
mcastIp, deviceId, port.toLong(), assignedVlan), mcastIp, deviceId, port.toLong(), assignedVlan),
(objective, error) -> (objective, error) ->
log.warn("Failed to update {} on {}/{}, vlan {}: {}", log.warn("Failed to update {} on {}/{}, vlan {}: {}",
mcastIp, deviceId, port.toLong(), assignedVlan, error)); mcastIp, deviceId, port.toLong(), assignedVlan, error));
newNextObj = nextObjBuilder(mcastIp, assignedVlan, existingPorts, null).add(); // Here we store the next objective with the remaining port
newNextObj = nextObjBuilder(mcastIp, assignedVlan,
existingPorts, nextObj.id()).removeFromExisting();
fwdObj = fwdObjBuilder(mcastIp, assignedVlan, newNextObj.id()).add(context); fwdObj = fwdObjBuilder(mcastIp, assignedVlan, newNextObj.id()).add(context);
mcastNextObjStore.put(mcastStoreKey, newNextObj); mcastNextObjStore.put(mcastStoreKey, newNextObj);
srManager.flowObjectiveService.next(deviceId, newNextObj);
srManager.flowObjectiveService.forward(deviceId, fwdObj);
} }
// Let's modify the next objective removing the bucket
newNextObj = nextObjBuilder(mcastIp, assignedVlan,
ImmutableSet.of(port), nextObj.id()).removeFromExisting();
srManager.flowObjectiveService.next(deviceId, newNextObj);
srManager.flowObjectiveService.forward(deviceId, fwdObj);
return existingPorts.isEmpty(); return existingPorts.isEmpty();
} }