package org.opendaylight.openflowplugin.applications.frm.impl;
+import java.math.BigInteger;
import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import java.util.concurrent.Callable;
import org.opendaylight.controller.md.sal.binding.api.*;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.openflowplugin.applications.frm.FlowNodeReconciliation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.StaleGroup;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.StaleGroupKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeatures;
import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesKey;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.slf4j.Logger;
private ListenerRegistration<FlowNodeReconciliationImpl> listenerRegistration;
+ private final int THREAD_POOL_SIZE = 4;
+ ExecutorService executor = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
+
private static final InstanceIdentifier<FlowCapableNode> II_TO_FLOW_CAPABLE_NODE
= InstanceIdentifier.builder(Nodes.class)
.child(Node.class)
public void remove(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode del,
InstanceIdentifier<FlowCapableNode> nodeIdent) {
if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE)){
- LOG.warn("Node removed: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Node removed: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
+ }
if ( ! nodeIdent.isWildcarded()) {
flowNodeDisconnected(nodeIdent);
public void add(InstanceIdentifier<FlowCapableNode> identifier, FlowCapableNode add,
InstanceIdentifier<FlowCapableNode> nodeIdent) {
if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE)){
- LOG.warn("Node added: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Node added: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
+ }
if ( ! nodeIdent.isWildcarded()) {
flowNodeConnected(nodeIdent);
connectedNode.toString());
reconciliationPreProcess(connectedNode);
}
- reconciliation(connectedNode);
+ ReconciliationTask reconciliationTask = new ReconciliationTask(connectedNode);
+ executor.execute(reconciliationTask);
}
}
- private void reconciliation(final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ private class ReconciliationTask implements Runnable {
- String sNode = nodeIdent.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
- long nDpId = getDpnIdFromNodeName(sNode);
-
- ReadOnlyTransaction trans = provider.getReadTranaction();
- Optional<FlowCapableNode> flowNode = Optional.absent();
+ InstanceIdentifier<FlowCapableNode> nodeIdentity;
- AtomicInteger counter = new AtomicInteger();
- //initialize the counter
- counter.set(0);
- try {
- flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdent).get();
- }
- catch (Exception e) {
- LOG.error("Fail with read Config/DS for Node {} !", nodeIdent, e);
+ public ReconciliationTask(final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ nodeIdentity = nodeIdent;
}
- if (flowNode.isPresent()) {
- /* Tables - have to be pushed before groups */
- // CHECK if while pusing the update, updateTableInput can be null to emulate a table add
- List<TableFeatures> tableList = flowNode.get().getTableFeatures() != null
- ? flowNode.get().getTableFeatures() : Collections.<TableFeatures> emptyList() ;
- for (TableFeatures tableFeaturesItem : tableList) {
- TableFeaturesKey tableKey = tableFeaturesItem.getKey();
- KeyedInstanceIdentifier<TableFeatures, TableFeaturesKey> tableFeaturesII
- = nodeIdent.child(TableFeatures.class, new TableFeaturesKey(tableKey.getTableId()));
- provider.getTableFeaturesCommiter().update(tableFeaturesII, tableFeaturesItem, null, nodeIdent);
+ @Override
+ public void run() {
+
+ String sNode = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
+ BigInteger nDpId = getDpnIdFromNodeName(sNode);
+
+ ReadOnlyTransaction trans = provider.getReadTranaction();
+ Optional<FlowCapableNode> flowNode = Optional.absent();
+
+ AtomicInteger counter = new AtomicInteger();
+ //initialize the counter
+ counter.set(0);
+ try {
+ flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdentity).get();
+ } catch (Exception e) {
+ LOG.error("Fail with read Config/DS for Node {} !", nodeIdentity, e);
}
+ if (flowNode.isPresent()) {
+ /* Tables - have to be pushed before groups */
+ // CHECK if while pusing the update, updateTableInput can be null to emulate a table add
+ List<TableFeatures> tableList = flowNode.get().getTableFeatures() != null
+ ? flowNode.get().getTableFeatures() : Collections.<TableFeatures>emptyList();
+ for (TableFeatures tableFeaturesItem : tableList) {
+ TableFeaturesKey tableKey = tableFeaturesItem.getKey();
+ KeyedInstanceIdentifier<TableFeatures, TableFeaturesKey> tableFeaturesII
+ = nodeIdentity.child(TableFeatures.class, new TableFeaturesKey(tableKey.getTableId()));
+ provider.getTableFeaturesCommiter().update(tableFeaturesII, tableFeaturesItem, null, nodeIdentity);
+ }
+
/* Groups - have to be first */
List<Group> groups = flowNode.get().getGroup() != null
? flowNode.get().getGroup() : Collections.<Group>emptyList();
List<Group> suspectedGroups = new ArrayList<>();
while ((!(toBeInstalledGroups.isEmpty()) || !(suspectedGroups.isEmpty())) &&
- (counter.get()<=provider.getConfiguration().getReconciliationRetryCount())) { //also check if the counter has not crossed the threshold
+ (counter.get() <= provider.getConfiguration().getReconciliationRetryCount())) { //also check if the counter has not crossed the threshold
- if(toBeInstalledGroups.isEmpty() && ! suspectedGroups.isEmpty()){
- LOG.error("These Groups are pointing to node-connectors that are not up yet {}",suspectedGroups.toString());
+ if (toBeInstalledGroups.isEmpty() && !suspectedGroups.isEmpty()) {
+ LOG.error("These Groups are pointing to node-connectors that are not up yet {}", suspectedGroups.toString());
toBeInstalledGroups.addAll(suspectedGroups);
break;
}
boolean okToInstall = true;
for (Bucket bucket : group.getBuckets().getBucket()) {
for (Action action : bucket.getAction()) {
- //chained-port
+ //chained-port
if (action.getAction().getImplementedInterface().getName()
- .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase")){
- String nodeConnectorUri = ((OutputActionCase)(action.getAction()))
+ .equals("org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase")) {
+ String nodeConnectorUri = ((OutputActionCase) (action.getAction()))
.getOutputAction().getOutputNodeConnector().getValue();
- LOG.warn("Installing the group for node connector {}",nodeConnectorUri);
+ LOG.warn("Installing the group for node connector {}", nodeConnectorUri);
//check if the nodeconnector is there in the multimap
boolean isPresent = provider.getFlowNodeConnectorInventoryTranslatorImpl()
.isNodeConnectorUpdated(nDpId, nodeConnectorUri);
//if yes set okToInstall = true
- if(isPresent){
- break;
+ if (isPresent) {
+ break;
}//else put it in a different list and still set okToInstall = true
else {
suspectedGroups.add(group);
LOG.error("Not yet received the node-connector updated for {} " +
- "for the group with id {}",nodeConnectorUri,group.getGroupId().toString());
- break;
+ "for the group with id {}", nodeConnectorUri, group.getGroupId().toString());
+ break;
}
}
}
}
- if (!okToInstall){
+ if (!okToInstall) {
//increment retry counter value
counter.incrementAndGet();
break;
}
-
}
if (okToInstall) {
final KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
- nodeIdent.child(Group.class, group.getKey());
- this.provider.getGroupCommiter().add(groupIdent, group, nodeIdent);
+ nodeIdentity.child(Group.class, group.getKey());
+ provider.getGroupCommiter().add(groupIdent, group, nodeIdentity);
alreadyInstalledGroupids.add(group.getGroupId().getValue());
iterator.remove();
// resetting the counter to zero
}
/* installation of suspected groups*/
- if(!toBeInstalledGroups.isEmpty()){
- for(Group group :toBeInstalledGroups){
- LOG.error("Installing the group {} finally although the port is not up after checking for {} times "
- ,group.getGroupId().toString(),provider.getConfiguration().getReconciliationRetryCount());
- final KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
- nodeIdent.child(Group.class, group.getKey());
- this.provider.getGroupCommiter().add(groupIdent, group, nodeIdent);
+ if (!toBeInstalledGroups.isEmpty()) {
+ for (Group group : toBeInstalledGroups) {
+ LOG.error("Installing the group {} finally although the port is not up after checking for {} times "
+ , group.getGroupId().toString(), provider.getConfiguration().getReconciliationRetryCount());
+ final KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
+ nodeIdentity.child(Group.class, group.getKey());
+ provider.getGroupCommiter().add(groupIdent, group, nodeIdentity);
+ }
}
- }
/* Meters */
- List<Meter> meters = flowNode.get().getMeter() != null
- ? flowNode.get().getMeter() : Collections.<Meter> emptyList();
- for (Meter meter : meters) {
- final KeyedInstanceIdentifier<Meter, MeterKey> meterIdent =
- nodeIdent.child(Meter.class, meter.getKey());
- this.provider.getMeterCommiter().add(meterIdent, meter, nodeIdent);
- }
+ List<Meter> meters = flowNode.get().getMeter() != null
+ ? flowNode.get().getMeter() : Collections.<Meter>emptyList();
+ for (Meter meter : meters) {
+ final KeyedInstanceIdentifier<Meter, MeterKey> meterIdent =
+ nodeIdentity.child(Meter.class, meter.getKey());
+ provider.getMeterCommiter().add(meterIdent, meter, nodeIdentity);
+ }
/* Flows */
- List<Table> tables = flowNode.get().getTable() != null
- ? flowNode.get().getTable() : Collections.<Table> emptyList();
- for (Table table : tables) {
- final KeyedInstanceIdentifier<Table, TableKey> tableIdent =
- nodeIdent.child(Table.class, table.getKey());
- List<Flow> flows = table.getFlow() != null ? table.getFlow() : Collections.<Flow> emptyList();
- for (Flow flow : flows) {
- final KeyedInstanceIdentifier<Flow, FlowKey> flowIdent =
- tableIdent.child(Flow.class, flow.getKey());
- this.provider.getFlowCommiter().add(flowIdent, flow, nodeIdent);
+ List<Table> tables = flowNode.get().getTable() != null
+ ? flowNode.get().getTable() : Collections.<Table>emptyList();
+ for (Table table : tables) {
+ final KeyedInstanceIdentifier<Table, TableKey> tableIdent =
+ nodeIdentity.child(Table.class, table.getKey());
+ List<Flow> flows = table.getFlow() != null ? table.getFlow() : Collections.<Flow>emptyList();
+ for (Flow flow : flows) {
+ final KeyedInstanceIdentifier<Flow, FlowKey> flowIdent =
+ tableIdent.child(Flow.class, flow.getKey());
+ provider.getFlowCommiter().add(flowIdent, flow, nodeIdentity);
+ }
}
}
- }
/* clean transaction */
- trans.close();
+ trans.close();
+ }
}
- private long getDpnIdFromNodeName(String nodeName) {
+ private BigInteger getDpnIdFromNodeName(String nodeName) {
String dpId = nodeName.substring(nodeName.lastIndexOf(SEPARATOR) + 1);
- return Long.parseLong(dpId);
- }
+ return new BigInteger(dpId);
+ }
private void reconciliationPreProcess(final InstanceIdentifier<FlowCapableNode> nodeIdent) {
-
List<InstanceIdentifier<StaleFlow>> staleFlowsToBeBulkDeleted = Lists.newArrayList();
List<InstanceIdentifier<StaleGroup>> staleGroupsToBeBulkDeleted = Lists.newArrayList();
List<InstanceIdentifier<StaleMeter>> staleMetersToBeBulkDeleted = Lists.newArrayList();
Code Review / openflowplugin.git / blobdiff