mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 11:51:43 +02:00
Code Issues Projects Releases Wiki Activity

[ONOS-7382] Ensure flow tables are removed when last entry is removed

Browse Source 
Change-Id: I967af049022faaf448ff474d88b9a707a6feb538
This commit is contained in:
Jordan Halterman 2018-01-16 17:08:09 -08:00 committed by Thomas Vachuska
parent 0e44012994
commit ce336f727d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/store/dist/src/main/java/org/onosproject/store/flow/impl/ECFlowRuleStore.java vendored
View File

@ -827,15 +827,16 @@ public class ECFlowRuleStore
public FlowEntry remove(DeviceId deviceId, FlowEntry rule) {
final AtomicReference<FlowEntry> removedRule = new AtomicReference<>();
getFlowEntriesInternal(rule.deviceId(), rule.id())
.computeIfPresent((StoredFlowEntry) rule, (k, stored) -> {
final Map<FlowId, Map<StoredFlowEntry, StoredFlowEntry>> flowTable = getFlowTable(deviceId);
flowTable.computeIfPresent(rule.id(), (flowId, flowEntries) -> {
flowEntries.computeIfPresent((StoredFlowEntry) rule, (k, stored) -> {
if (rule instanceof DefaultFlowEntry) {
DefaultFlowEntry toRemove = (DefaultFlowEntry) rule;
if (stored instanceof DefaultFlowEntry) {
DefaultFlowEntry storedEntry = (DefaultFlowEntry) stored;
if (toRemove.created() < storedEntry.created()) {
log.debug("Trying to remove more recent flow entry {} (stored: {})",
toRemove, stored);
toRemove, stored);
// the key is not updated, removedRule remains null
return stored;
}
@ -844,6 +845,8 @@ public class ECFlowRuleStore
removedRule.set(stored);
return null;
});
return flowEntries.isEmpty() ? null : flowEntries;
});
if (removedRule.get() != null) {
lastUpdateTimes.put(deviceId, System.currentTimeMillis());