X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcontainermanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcontainermanager%2Finternal%2FContainerManager.java;h=7319d5a15d360ed7d5f834c8144bd35f562d9691;hp=5058e2a0ac8870fc47f4f8b81f163f0d806dd48a;hb=c87a38c21b23c61fb70cebe2b0607c235200ed12;hpb=25186c4271c02a6774e1a16f1e16a71ca06c693f diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java index 5058e2a0ac..7319d5a15d 100644 --- a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java +++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java @@ -47,6 +47,7 @@ import org.opendaylight.controller.sal.authorization.UserLevel; import org.opendaylight.controller.sal.core.ContainerFlow; import org.opendaylight.controller.sal.core.IContainerAware; import org.opendaylight.controller.sal.core.IContainerListener; +import org.opendaylight.controller.sal.core.IContainerLocalListener; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.core.UpdateType; @@ -93,6 +94,8 @@ public class ContainerManager extends Authorization implements IContaine private final Set iContainerAware = Collections.synchronizedSet(new HashSet()); private final Set iContainerListener = Collections .synchronizedSet(new HashSet()); + private final Set iContainerLocalListener = Collections + .synchronizedSet(new HashSet()); void setIContainerListener(IContainerListener s) { if (this.iContainerListener != null) { @@ -128,6 +131,18 @@ public class ContainerManager extends Authorization implements IContaine } } + void setIContainerLocalListener(IContainerLocalListener s) { + if (this.iContainerLocalListener != null) { + this.iContainerLocalListener.add(s); + } + } + + void unsetIContainerLocalListener(IContainerLocalListener s) { + if (this.iContainerLocalListener != null) { + this.iContainerLocalListener.remove(s); + } + } + public void setIContainerAware(IContainerAware iContainerAware) { if (!this.iContainerAware.contains(iContainerAware)) { this.iContainerAware.add(iContainerAware); @@ -141,7 +156,7 @@ public class ContainerManager extends Authorization implements IContaine public void unsetIContainerAware(IContainerAware iContainerAware) { this.iContainerAware.remove(iContainerAware); // There is no need to do cleanup of the component when - // unregister because it will be taken care by the Containerd + // unregister because it will be taken care by the Container // component itself } @@ -217,9 +232,10 @@ public class ContainerManager extends Authorization implements IContaine roles = (ConcurrentMap) clusterServices.getCache("containermgr.roles"); - if (containerConfigs.size() > 0) { + if (inContainerMode()) { for (Map.Entry entry : containerConfigs.entrySet()) { - notifyContainerChangeInternal(entry.getValue(), UpdateType.ADDED); + // Notify global and local listeners about the mode change + notifyContainerChangeInternal(entry.getValue(), UpdateType.ADDED, true); } } } @@ -231,17 +247,26 @@ public class ContainerManager extends Authorization implements IContaine @Override public void entryUpdated(String key, Object value, String cacheName, boolean originLocal) { + /* + * This is were container manager replays a configuration event that was + * notified by its peer from a cluster node where the configuration + * happened. Only the global listeners, the cluster unaware classes, + * (mainly the shim classes in the sdn protocol plugins) need to receive + * these notifications on this cluster node. The cluster aware classes, + * like the functional modules which reacts on these events, must _not_ + * be notified to avoid parallel computation in the cluster. + */ if (!originLocal) { if (value instanceof NodeConnectorsChangeEvent) { NodeConnectorsChangeEvent event = (NodeConnectorsChangeEvent) value; List ncList = event.getNodeConnectors(); - notifyContainerEntryChangeInternal(key, ncList, event.getUpdateType()); + notifyContainerEntryChangeInternal(key, ncList, event.getUpdateType(), false); } else if (value instanceof ContainerFlowChangeEvent) { ContainerFlowChangeEvent event = (ContainerFlowChangeEvent) value; - notifyCFlowChangeInternal(key, event.getConfigList(), event.getUpdateType()); + notifyCFlowChangeInternal(key, event.getConfigList(), event.getUpdateType(), false); } else if (value instanceof ContainerChangeEvent) { ContainerChangeEvent event = (ContainerChangeEvent) value; - notifyContainerChangeInternal(event.getConfig(), event.getUpdateType()); + notifyContainerChangeInternal(event.getConfig(), event.getUpdateType(), false); } } } @@ -273,6 +298,7 @@ public class ContainerManager extends Authorization implements IContaine // Clear local states this.iContainerAware.clear(); this.iContainerListener.clear(); + this.iContainerLocalListener.clear(); } /** @@ -291,10 +317,10 @@ public class ContainerManager extends Authorization implements IContaine for (Match match : conf.getMatches()) { ContainerFlow cFlow = new ContainerFlow(match); if (delete) { - logger.trace("Removing Flow Spec %s from Container {}", conf.getName(), containerName); + logger.trace("Removing Flow Spec {} from Container {}", conf.getName(), containerName); container.deleteFlowSpec(cFlow); } else { - logger.trace("Adding Flow Spec %s to Container {}", conf.getName(), containerName); + logger.trace("Adding Flow Spec {} to Container {}", conf.getName(), containerName); container.addFlowSpec(cFlow); } @@ -595,9 +621,9 @@ public class ContainerManager extends Authorization implements IContaine String msg = null; ContainerData other = containerData.get(otherContainerName); if (flowSpecList.isEmpty()) { - msg = String.format("Port %s is shared and flow spec is emtpy for this container", port); + msg = String.format("Port %s is shared and flow spec is empty for this container", port); } else if (other.isFlowSpecEmpty()) { - msg = String.format("Port %s is shared and flow spec is emtpy for the other container", port); + msg = String.format("Port %s is shared and flow spec is empty for the other container", port); } else if (!checkCommonContainerFlow(flowSpecList, other.getContainerFlowSpecs()).isSuccess()) { msg = String.format("Port %s is shared and other container has common flow spec", port); } @@ -735,7 +761,7 @@ public class ContainerManager extends Authorization implements IContaine File directory = new File(startupLocation); String[] fileList = directory.list(); - logger.trace("Deleteing startup configuration files for container {}", containerName); + logger.trace("Deleting startup configuration files for container {}", containerName); if (fileList != null) { for (String fileName : fileList) { if (fileName.contains(containerPrint)) { @@ -800,13 +826,12 @@ public class ContainerManager extends Authorization implements IContaine * @param containerName * @param delete */ - private void updateResourceGroups(String containerName, boolean delete) { - String containerProfile = System.getProperty("container.profile"); - if (containerProfile == null) containerProfile = "Container"; + private void updateResourceGroups(ContainerConfig containerConf, boolean delete) { // Container Roles and Container Resource Group - String groupName = containerProfile+"-" + containerName; - String containerAdminRole = containerProfile+"-" + containerName + "-Admin"; - String containerOperatorRole = containerProfile+"-" + containerName + "-Operator"; + String containerName = containerConf.getContainer(); + String groupName = containerConf.getContainerGroupName(); + String containerAdminRole = containerConf.getContainerAdminRole(); + String containerOperatorRole = containerConf.getContainerOperatorRole(); Set allContainerSet = resourceGroups.get(allResourcesGroupName); if (delete) { resourceGroups.remove(groupName); @@ -858,15 +883,19 @@ public class ContainerManager extends Authorization implements IContaine } /** - * Notify the ContainerListener listeners in case the container mode has changed - * following a container configuration operation Note: this call must happen - * after the configuration db has been updated + * Notify the ContainerListener listeners in case the container mode has + * changed following a container configuration operation Note: this call + * must happen after the configuration db has been updated * * @param lastActionDelete - * true if the last container configuration operation was a container - * delete operation + * true if the last container configuration operation was a + * container delete operation + * @param notifyLocal + * if true, the notification is also sent to the + * IContainerLocalListener classes besides the IContainerListener + * classes */ - private void notifyContainerModeChange(boolean lastActionDelete) { + private void notifyContainerModeChange(boolean lastActionDelete, boolean notifyLocal) { if (lastActionDelete == false && containerConfigs.size() == 1) { logger.info("First container Creation. Inform listeners"); synchronized (this.iContainerListener) { @@ -874,6 +903,13 @@ public class ContainerManager extends Authorization implements IContaine i.containerModeUpdated(UpdateType.ADDED); } } + if (notifyLocal) { + synchronized (this.iContainerLocalListener) { + for (IContainerLocalListener i : this.iContainerLocalListener) { + i.containerModeUpdated(UpdateType.ADDED); + } + } + } } else if (lastActionDelete == true && containerConfigs.isEmpty()) { logger.info("Last container Deletion. Inform listeners"); synchronized (this.iContainerListener) { @@ -881,12 +917,19 @@ public class ContainerManager extends Authorization implements IContaine i.containerModeUpdated(UpdateType.REMOVED); } } + if (notifyLocal) { + synchronized (this.iContainerLocalListener) { + for (IContainerLocalListener i : this.iContainerLocalListener) { + i.containerModeUpdated(UpdateType.REMOVED); + } + } + } } } private Status addRemoveContainerEntries(String containerName, List nodeConnectorsString, boolean delete) { // Construct action message - String action = String.format("Node conenctor(s) %s container %s: %s", delete ? "removal from" : "addition to", + String action = String.format("Node connector(s) %s container %s: %s", delete ? "removal from" : "addition to", containerName, nodeConnectorsString); // Validity Check @@ -954,28 +997,41 @@ public class ContainerManager extends Authorization implements IContaine // Update cluster Configuration cache containerConfigs.put(containerName, entryConf); - // Notify + // Notify global and local listeners UpdateType update = (delete) ? UpdateType.REMOVED : UpdateType.ADDED; - notifyContainerEntryChangeInternal(containerName, nodeConnectors, update); + notifyContainerEntryChangeInternal(containerName, nodeConnectors, update, true); // Trigger cluster notification containerChangeEvents.put(containerName, new NodeConnectorsChangeEvent(nodeConnectors, update)); return status; } - private void notifyContainerChangeInternal(ContainerConfig conf, UpdateType update) { + private void notifyContainerChangeInternal(ContainerConfig conf, UpdateType update, boolean notifyLocal) { String containerName = conf.getContainerName(); logger.trace("Notifying listeners on {} for container {}", update, containerName); // Back-end World: container name forced to lower case String container = containerName.toLowerCase(Locale.ENGLISH); boolean delete = (update == UpdateType.REMOVED); // Check if a container mode change notification is needed - notifyContainerModeChange(delete); + notifyContainerModeChange(delete, notifyLocal); // Notify listeners notifyContainerAwareListeners(container, delete); + + /* + * This is a quick fix until configuration service becomes the + * centralized configuration management place. Here container manager + * will remove the startup files for all the bundles that are present in + * the container being deleted. Do the cleanup here in Container manger + * as do not want to put this temporary code in Configuration manager + * yet which is ODL. + */ + if (delete) { + // TODO: remove when Config Mgr takes over + removeComponentsStartUpfiles(containerName); + } } - private void notifyContainerEntryChangeInternal(String containerName, List ncList, UpdateType update) { + private void notifyContainerEntryChangeInternal(String containerName, List ncList, UpdateType update, boolean notifyLocal) { logger.trace("Notifying listeners on {} for ports {} in container {}", update, ncList, containerName); // Back-end World: container name forced to lower case String container = containerName.toLowerCase(Locale.ENGLISH); @@ -986,21 +1042,39 @@ public class ContainerManager extends Authorization implements IContaine i.nodeConnectorUpdated(container, nodeConnector, update); } } + // Check if the Functional Modules need to be notified as well + if (notifyLocal) { + synchronized (this.iContainerLocalListener) { + for (IContainerLocalListener i : this.iContainerLocalListener) { + i.nodeConnectorUpdated(container, nodeConnector, update); + } + } + } } } - private void notifyCFlowChangeInternal(String containerName, List confList, UpdateType update) { + private void notifyCFlowChangeInternal(String containerName, List confList, UpdateType update, + boolean notifyLocal) { logger.trace("Notifying listeners on {} for flow specs {} in container {}", update, confList, containerName); // Back-end World: container name forced to lower case String container = containerName.toLowerCase(Locale.ENGLISH); - synchronized (this.iContainerListener) { - for (ContainerFlowConfig conf : confList) { - for (Match match : conf.getMatches()) { - ContainerFlow cFlow = new ContainerFlow(match); + + for (ContainerFlowConfig conf : confList) { + for (Match match : conf.getMatches()) { + ContainerFlow cFlow = new ContainerFlow(match); + synchronized (this.iContainerListener) { for (IContainerListener i : this.iContainerListener) { i.containerFlowUpdated(container, cFlow, cFlow, update); } } + // Check if the Functional Modules need to be notified as well + if (notifyLocal) { + synchronized (this.iContainerLocalListener) { + for (IContainerLocalListener i : this.iContainerLocalListener) { + i.containerFlowUpdated(container, cFlow, cFlow, update); + } + } + } } } } @@ -1067,9 +1141,9 @@ public class ContainerManager extends Authorization implements IContaine // Update cluster cache this.containerConfigs.put(containerName, containerConfig); - // Notify listeners + // Notify global and local listeners UpdateType update = (delete) ? UpdateType.REMOVED : UpdateType.ADDED; - notifyCFlowChangeInternal(containerName, cFlowConfList, update); + notifyCFlowChangeInternal(containerName, cFlowConfList, update, true); // Trigger cluster notification containerChangeEvents.put(containerName, new ContainerFlowChangeEvent(cFlowConfList, update)); @@ -1130,19 +1204,6 @@ public class ContainerManager extends Authorization implements IContaine return status; } - /* - * This is a quick fix until configuration service becomes the - * centralized configuration management place. Here container manager will - * remove the startup files for all the bundles that are present in the - * container being deleted. Do the cleanup here in Container manger as do not - * want to put this temporary code in Configuration manager yet which is - * ODL. - */ - if (delete) { - // TODO: remove when Config Mgr takes over - removeComponentsStartUpfiles(containerName); - } - /* * Update Configuration: This will trigger the notifications on cache * update callback locally and on the other cluster nodes @@ -1154,11 +1215,11 @@ public class ContainerManager extends Authorization implements IContaine } // Automatically create and populate user and resource groups - updateResourceGroups(containerName, delete); + updateResourceGroups(containerConf, delete); - // Notify listeners + // Notify global and local listeners UpdateType update = (delete) ? UpdateType.REMOVED : UpdateType.ADDED; - notifyContainerChangeInternal(containerConf, update); + notifyContainerChangeInternal(containerConf, update, true); // Trigger cluster notification containerChangeEvents.put(containerName, new ContainerChangeEvent(containerConf, update)); @@ -1166,8 +1227,8 @@ public class ContainerManager extends Authorization implements IContaine if (update == UpdateType.ADDED) { if (containerConf.hasFlowSpecs()) { List specList = containerConf.getContainerFlowConfigs(); - // Notify flow spec addition - notifyCFlowChangeInternal(containerName, specList, update); + // Notify global and local listeners about flow spec addition + notifyCFlowChangeInternal(containerName, specList, update, true); // Trigger cluster notification containerChangeEvents.put(containerName, new ContainerFlowChangeEvent(specList, update)); @@ -1175,13 +1236,16 @@ public class ContainerManager extends Authorization implements IContaine if (containerConf.hasNodeConnectors()) { List ncList = containerConf.getPortList(); - // Notify port(s) addition - notifyContainerEntryChangeInternal(containerName, ncList, update); + // Notify global and local listeners about port(s) addition + notifyContainerEntryChangeInternal(containerName, ncList, update, true); // Trigger cluster notification containerChangeEvents.put(containerName, new NodeConnectorsChangeEvent(ncList, update)); } } + if (delete) { + clusterServices.removeContainerCaches(containerName); + } return status; } @@ -1335,10 +1399,6 @@ public class ContainerManager extends Authorization implements IContaine return; } String staticVlan = ci.nextArgument(); - if (staticVlan == null) { - ci.print("Static Vlan not specified"); - return; - } ContainerConfig containerConfig = new ContainerConfig(containerName, staticVlan, null, null); ci.println(this.addRemoveContainer(containerConfig, false)); } @@ -1600,4 +1660,9 @@ public class ContainerManager extends Authorization implements IContaine public boolean hasNonDefaultContainer() { return !containerConfigs.keySet().isEmpty(); } + + @Override + public boolean inContainerMode() { + return this.containerConfigs.size() > 0; + } }