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

Fix the case of dropped flowEntries that can occur when the current backup is down and no alternate backup exists

Browse Source 
Change-Id: If584cb4bb99aa3930ac30ff6b85a5e2ed56071f0
This commit is contained in:
Madan Jampani 2015-05-20 22:39:17 -07:00 committed by Gerrit Code Review
parent 79945e8216
commit 7267c5559b
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java vendored
View File

@ -614,13 +614,28 @@ public class NewDistributedFlowRuleStore
// ignore since this event is for a device this node does not manage. // ignore since this event is for a device this node does not manage.
return; return;
} }
NodeId latestBackupNode = getBackupNode(deviceId); NodeId newBackupNode = getBackupNode(deviceId);
NodeId existingBackupNode = lastBackupNodes.get(deviceId); NodeId currentBackupNode = lastBackupNodes.get(deviceId);
if (Objects.equal(latestBackupNode, existingBackupNode)) { if (Objects.equal(newBackupNode, currentBackupNode)) {
// ignore since backup location hasn't changed. // ignore since backup location hasn't changed.
return; return;
} }
backupSenderExecutor.schedule(() -> backupFlowEntries(latestBackupNode, Sets.newHashSet(deviceId)), if (currentBackupNode != null && newBackupNode == null) {
// Current backup node is most likely down and no alternate backup node
// has been chosen. Clear current backup location so that we can resume
// backups when either current backup comes online or a different backup node
// is chosen.
log.warn("Lost backup location {} for deviceId {} and no alternate backup node exists. "
+ "Flows can be lost if the master goes down", currentBackupNode, deviceId);
lastBackupNodes.remove(deviceId);
lastBackupTimes.remove(deviceId);
return;
// TODO: Pick any available node as backup and ensure hand-off occurs when
// a new master is elected.
}
log.info("Backup location for {} has changed from {} to {}.",
deviceId, currentBackupNode, newBackupNode);
backupSenderExecutor.schedule(() -> backupFlowEntries(newBackupNode, Sets.newHashSet(deviceId)),
0, 0,
TimeUnit.SECONDS); TimeUnit.SECONDS);
} }
@ -712,8 +727,9 @@ public class NewDistributedFlowRuleStore
Long lastBackupTime = lastBackupTimes.get(deviceId); Long lastBackupTime = lastBackupTimes.get(deviceId);
Long lastUpdateTime = lastUpdateTimes.get(deviceId); Long lastUpdateTime = lastUpdateTimes.get(deviceId);
NodeId lastBackupNode = lastBackupNodes.get(deviceId); NodeId lastBackupNode = lastBackupNodes.get(deviceId);
NodeId newBackupNode = getBackupNode(deviceId);
return lastBackupTime == null return lastBackupTime == null
|| !Objects.equal(lastBackupNode, getBackupNode(deviceId)) || !Objects.equal(lastBackupNode, newBackupNode)
|| (lastUpdateTime != null && lastUpdateTime > lastBackupTime); || (lastUpdateTime != null && lastUpdateTime > lastBackupTime);
}) })
.collect(Collectors.toSet()); .collect(Collectors.toSet());
@ -735,7 +751,7 @@ public class NewDistributedFlowRuleStore
} }
private void onBackupReceipt(Map<DeviceId, Map<FlowId, Set<StoredFlowEntry>>> flowTables) { private void onBackupReceipt(Map<DeviceId, Map<FlowId, Set<StoredFlowEntry>>> flowTables) {
log.debug("Received flows for {} to backup", flowTables.keySet()); log.debug("Received flowEntries for {} to backup", flowTables.keySet());
Set<DeviceId> managedDevices = mastershipService.getDevicesOf(local); Set<DeviceId> managedDevices = mastershipService.getDevicesOf(local);
// Only process those devices are that not managed by the local node. // Only process those devices are that not managed by the local node.
Maps.filterKeys(flowTables, deviceId -> !managedDevices.contains(deviceId)) Maps.filterKeys(flowTables, deviceId -> !managedDevices.contains(deviceId))