X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fforwardingrulesmanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager%2Finternal%2FForwardingRulesManagerImpl.java;h=7fae181ba632c0aa51a26d96dccd93698d313eab;hb=162da091eb6080acbf0128c27124eea1389c687c;hp=d4588d620b6a7f0900dc50df39aab3ac43efa215;hpb=025f7e1bbbc05faccb2bdc146d0509953cfbd598;p=controller.git diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java index d4588d620b..7fae181ba6 100644 --- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java +++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java @@ -929,16 +929,21 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port * on the network node */ private void updateFlowsContainerFlow() { + Set toReInstall = new HashSet(); + // First remove all installed entries for (ConcurrentMap.Entry entry : installedSwView.entrySet()) { FlowEntryInstall current = entry.getValue(); - FlowEntry reInstall = current.getOriginal(); + // Store the original entry + toReInstall.add(current.getOriginal()); // Remove the old couples. No validity checks to be run, use the // internal remove this.removeEntryInternal(current, false); - + } + // Then reinstall the original entries + for (FlowEntry entry : toReInstall) { // Reinstall the original flow entries, via the regular path: new // cFlow merge + validations - this.installFlowEntry(reInstall); + this.installFlowEntry(entry); } } @@ -1131,7 +1136,7 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port return; } - log.debug("FRM allocateCaches for Container {}", container); + log.debug("Allocating caches for Container {}", container.getName()); try { clusterContainerService.createCache("frm.originalSwView", @@ -1165,9 +1170,9 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); } catch (CacheConfigException cce) { - log.error("FRM CacheConfigException"); + log.error("CacheConfigException"); } catch (CacheExistException cce) { - log.error("FRM CacheExistException"); + log.error("CacheExistException"); } } @@ -1180,76 +1185,76 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port return; } - log.debug("FRM retrieveCaches for Container {}", container); + log.debug("Retrieving Caches for Container {}", container.getName()); map = clusterContainerService.getCache("frm.originalSwView"); if (map != null) { originalSwView = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.originalSwView allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.originalSwView cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.installedSwView"); if (map != null) { installedSwView = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.installedSwView allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.installedSwView cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.nodeFlows"); if (map != null) { nodeFlows = (ConcurrentMap>) map; } else { - log.error("FRM Cache frm.nodeFlows allocation failed for Container {}", container.getName()); + log.error("Retrieval of cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.groupFlows"); if (map != null) { groupFlows = (ConcurrentMap>) map; } else { - log.error("FRM Cache frm.groupFlows allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.groupFlows cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.staticFlows"); if (map != null) { staticFlows = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.staticFlows allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.staticFlows cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.flowsSaveEvent"); if (map != null) { flowsSaveEvent = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.flowsSaveEvent allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.flowsSaveEvent cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.staticFlowsOrdinal"); if (map != null) { staticFlowsOrdinal = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.staticFlowsOrdinal allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.staticFlowsOrdinal cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.portGroupConfigs"); if (map != null) { portGroupConfigs = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.portGroupConfigs allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.portGroupConfigs cache failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.portGroupData"); if (map != null) { portGroupData = (ConcurrentMap>) map; } else { - log.error("FRM Cache frm.portGroupData allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.portGroupData allocation failed for Container {}", container.getName()); } map = clusterContainerService.getCache("frm.TSPolicies"); if (map != null) { TSPolicies = (ConcurrentMap) map; } else { - log.error("FRM Cache frm.TSPolicies allocation failed for Container {}", container.getName()); + log.error("Retrieval of frm.TSPolicies cache failed for Container {}", container.getName()); } } @@ -1444,7 +1449,7 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port } // Program the network node - Status status = this.removeEntry(config.getFlowEntry(), false); + Status status = this.uninstallFlowEntry(config.getFlowEntry()); // Update configuration database if programming was successful if (status.isSuccess()) { @@ -1543,7 +1548,7 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port // If flow is installed, program the network node status = new Status(StatusCode.SUCCESS, "Saved in config"); if (oldFlowConfig.installInHw()) { - status = this.modifyEntry(oldFlowConfig.getFlowEntry(), newFlowConfig.getFlowEntry(), false); + status = this.modifyFlowEntry(oldFlowConfig.getFlowEntry(), newFlowConfig.getFlowEntry()); } // Update configuration database if programming was successful @@ -1588,16 +1593,14 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port } if (target != null) { // Program the network node - Status status; - if (target.installInHw()) { - status = this.removeEntry(target.getFlowEntry(), false); - } else { - status = this.addEntry(target.getFlowEntry(), false); + Status status = (target.installInHw()) ? this.uninstallFlowEntry(target.getFlowEntry()) : this + .installFlowEntry(target.getFlowEntry()); + if (status.isSuccess()) { + // Update Configuration database + target.setStatus(SUCCESS); + target.toggleInstallation(); + staticFlows.put(key, target); } - // Update Configuration database - target.setStatus(SUCCESS); - target.toggleInstallation(); - staticFlows.put(key, target); return status; } @@ -2219,12 +2222,19 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port @Override public void tagUpdated(String containerName, Node n, short oldTag, short newTag, UpdateType t) { - + if (!container.getName().equals(containerName)) { + return; + } } @Override - public void containerFlowUpdated(String containerName, ContainerFlow previousFlow, ContainerFlow currentFlow, + public void containerFlowUpdated(String containerName, ContainerFlow previous, ContainerFlow current, UpdateType t) { + if (!container.getName().equals(containerName)) { + return; + } + log.trace("Container {}: Updating installed flows because of container flow change: {} {}", + container.getName(), t, current); /* * Whether it is an addition or removal, we have to recompute the merged * flows entries taking into account all the current container flows @@ -2235,11 +2245,17 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager, Port @Override public void nodeConnectorUpdated(String containerName, NodeConnector p, UpdateType t) { - // No action + if (!container.getName().equals(containerName)) { + return; + } } @Override public void containerModeUpdated(UpdateType update) { + // Only default container instance reacts on this event + if (!container.getName().equals(GlobalConstants.DEFAULT.toString())) { + return; + } switch (update) { case ADDED: this.inContainerMode = true;