/**
- * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2014, 2017 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
package org.opendaylight.openflowplugin.applications.frm.impl;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
-
-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 com.google.common.util.concurrent.JdkFutureAdapters;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
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.openflowplugin.applications.frm.ForwardingRulesManager;
-import org.opendaylight.openflowplugin.common.wait.SimpleTaskRetryLooper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase;
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.flow.inventory.rev130819.tables.table.StaleFlow;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.StaleFlowKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.Buckets;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey;
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;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-
-
/**
- * forwardingrules-manager
- * org.opendaylight.openflowplugin.applications.frm
- *
- * FlowNode Reconciliation Listener
- * Reconciliation for a new FlowNode
+ * Default implementation of {@link ForwardingRulesManager}
*
* @author <a href="mailto:vdemcak@cisco.com">Vaclav Demcak</a>
- *
- * Created: Jun 13, 2014
*/
public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
+ private static final Logger LOG = LoggerFactory.getLogger(FlowNodeReconciliationImpl.class);
- private static final Logger LOG = LoggerFactory.getLogger(FlowNodeReconciliationImpl.class);
+ //The number of nanoseconds to wait for a single group to be added.
+ private static final long ADD_GROUP_TIMEOUT = TimeUnit.SECONDS.toNanos(3);
- private final DataBroker dataBroker;
+ //The maximum number of nanoseconds to wait for completion of add-group RPCs.
+ private static final long MAX_ADD_GROUP_TIMEOUT = TimeUnit.SECONDS.toNanos(20);
+ private static final String SEPARATOR = ":";
+ private static final int THREAD_POOL_SIZE = 4;
+ private final DataBroker dataBroker;
private final ForwardingRulesManager provider;
- public static final String SEPARATOR = ":";
-
- private ListenerRegistration<FlowNodeReconciliationImpl> listenerRegistration;
-
- private static final InstanceIdentifier<FlowCapableNode> II_TO_FLOW_CAPABLE_NODE
- = InstanceIdentifier.builder(Nodes.class)
- .child(Node.class)
- .augmentation(FlowCapableNode.class)
- .build();
+ private final ExecutorService executor = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
public FlowNodeReconciliationImpl (final ForwardingRulesManager manager, final DataBroker db) {
this.provider = Preconditions.checkNotNull(manager, "ForwardingRulesManager can not be null!");
dataBroker = Preconditions.checkNotNull(db, "DataBroker can not be null!");
- /* Build Path */
- final InstanceIdentifier<FlowCapableNode> flowNodeWildCardIdentifier = InstanceIdentifier.create(Nodes.class)
- .child(Node.class).augmentation(FlowCapableNode.class);
-
- final DataTreeIdentifier<FlowCapableNode> treeId =
- new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, flowNodeWildCardIdentifier);
-
- try {
- SimpleTaskRetryLooper looper = new SimpleTaskRetryLooper(ForwardingRulesManagerImpl.STARTUP_LOOP_TICK,
- ForwardingRulesManagerImpl.STARTUP_LOOP_MAX_RETRIES);
-
- listenerRegistration = looper.loopUntilNoException(new Callable<ListenerRegistration<FlowNodeReconciliationImpl>>() {
- @Override
- public ListenerRegistration<FlowNodeReconciliationImpl> call() throws Exception {
- return dataBroker.registerDataTreeChangeListener(treeId, FlowNodeReconciliationImpl.this);
- }
- });
- } catch (Exception e) {
- LOG.warn("data listener registration failed: {}", e.getMessage());
- LOG.debug("data listener registration failed.. ", e);
- throw new IllegalStateException("FlowNodeReconciliation startup fail! System needs restart.", e);
- }
}
@Override
public void close() {
- if (listenerRegistration != null) {
- try {
- listenerRegistration.close();
- } catch (Exception e) {
- LOG.warn("Error by stop FRM FlowNodeReconilListener: {}", e.getMessage());
- LOG.debug("Error by stop FRM FlowNodeReconilListener..", e);
- }
- listenerRegistration = null;
+ if (executor != null) {
+ executor.shutdownNow();
}
}
@Override
- public void onDataTreeChanged(@Nonnull Collection<DataTreeModification<FlowCapableNode>> changes) {
- Preconditions.checkNotNull(changes, "Changes may not be null!");
-
- for (DataTreeModification<FlowCapableNode> change : changes) {
- final InstanceIdentifier<FlowCapableNode> key = change.getRootPath().getRootIdentifier();
- final DataObjectModification<FlowCapableNode> mod = change.getRootNode();
- final InstanceIdentifier<FlowCapableNode> nodeIdent =
- key.firstIdentifierOf(FlowCapableNode.class);
-
- switch (mod.getModificationType()) {
- case DELETE:
- remove(key, mod.getDataBefore(), nodeIdent);
- break;
- case SUBTREE_MODIFIED:
- update(key, mod.getDataBefore(), mod.getDataAfter(), nodeIdent);
- break;
- case WRITE:
- if (mod.getDataBefore() == null) {
- add(key, mod.getDataAfter(), nodeIdent);
- } else {
- update(key, mod.getDataBefore(), mod.getDataAfter(), nodeIdent);
- }
- break;
- default:
- throw new IllegalArgumentException("Unhandled modification type " + mod.getModificationType());
- }
- }
- }
-
-
-
- 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 ( ! nodeIdent.isWildcarded()) {
- flowNodeDisconnected(nodeIdent);
- }
-
+ public void reconcileConfiguration(InstanceIdentifier<FlowCapableNode> connectedNode) {
+ if (provider.isReconciliationDisabled()) {
+ LOG.debug("Reconciliation is disabled by user. Skipping reconciliation of node : {}", connectedNode
+ .firstKeyOf(Node.class));
+ return;
}
- }
-
-
- public void update(InstanceIdentifier<FlowCapableNode> identifier,
- FlowCapableNode original, FlowCapableNode update, InstanceIdentifier<FlowCapableNode> nodeIdent) {
- if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE)){
- LOG.warn("Node updated: {}",nodeIdent.firstKeyOf(Node.class).getId().getValue());
- //donot need to do anything as we are not considering updates here
- if (!nodeIdent.isWildcarded()) {
- // then force registration to local node cache and reconcile
- flowNodeConnected(nodeIdent, true);
+ if (provider.isNodeOwner(connectedNode)) {
+ LOG.info("Triggering reconciliation for device {}", connectedNode.firstKeyOf(Node.class));
+ if (provider.isStaleMarkingEnabled()) {
+ LOG.info("Stale-Marking is ENABLED and proceeding with deletion of stale-marked entities on switch {}",
+ connectedNode.toString());
+ reconciliationPreProcess(connectedNode);
}
+ ReconciliationTask reconciliationTask = new ReconciliationTask(connectedNode);
+ executor.execute(reconciliationTask);
}
}
+ private class ReconciliationTask implements Runnable {
- 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());
+ InstanceIdentifier<FlowCapableNode> nodeIdentity;
- if ( ! nodeIdent.isWildcarded()) {
- flowNodeConnected(nodeIdent);
- }
+ public ReconciliationTask(final InstanceIdentifier<FlowCapableNode> nodeIdent) {
+ nodeIdentity = nodeIdent;
}
- }
- @Override
- public void flowNodeDisconnected(InstanceIdentifier<FlowCapableNode> disconnectedNode) {
- provider.unregistrateNode(disconnectedNode);
- }
+ @Override
+ public void run() {
- @Override
- public void flowNodeConnected(InstanceIdentifier<FlowCapableNode> connectedNode) {
- flowNodeConnected(connectedNode, false);
- }
+ String sNode = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
+ BigInteger nDpId = getDpnIdFromNodeName(sNode);
- private void flowNodeConnected(InstanceIdentifier<FlowCapableNode> connectedNode, boolean force) {
- if (force || !provider.isNodeActive(connectedNode)) {
- provider.registrateNewNode(connectedNode);
+ ReadOnlyTransaction trans = provider.getReadTranaction();
+ Optional<FlowCapableNode> flowNode = Optional.absent();
- if(!provider.isNodeOwner(connectedNode)) { return; }
-
- if (provider.getConfiguration().isStaleMarkingEnabled()) {
- LOG.info("Stale-Marking is ENABLED and proceeding with deletion of stale-marked entities on switch {}",
- connectedNode.toString());
- reconciliationPreProcess(connectedNode);
+ //initialize the counter
+ int counter = 0;
+ try {
+ flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdentity).get();
+ } catch (Exception e) {
+ LOG.error("Fail with read Config/DS for Node {} !", nodeIdentity, e);
}
- reconciliation(connectedNode);
- }
- }
-
- private void reconciliation(final InstanceIdentifier<FlowCapableNode> nodeIdent) {
-
- String sNode = nodeIdent.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
- long 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, nodeIdent).get();
- }
- catch (Exception e) {
- LOG.error("Fail with read Config/DS for Node {} !", nodeIdent, e);
- }
- if (flowNode.isPresent()) {
+ 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);
- }
+ // 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> toBeInstalledGroups = new ArrayList<>();
toBeInstalledGroups.addAll(groups);
- List<Long> alreadyInstalledGroupids = new ArrayList<>();
//new list for suspected groups pointing to ports .. when the ports come up late
List<Group> suspectedGroups = new ArrayList<>();
+ Map<Long, ListenableFuture<?>> groupFutures = new HashMap<>();
while ((!(toBeInstalledGroups.isEmpty()) || !(suspectedGroups.isEmpty())) &&
- (counter.get()<=provider.getConfiguration().getReconciliationRetryCount())) { //also check if the counter has not crossed the threshold
+ (counter <= provider.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;
}
while (iterator.hasNext()) {
Group group = iterator.next();
boolean okToInstall = true;
- for (Bucket bucket : group.getBuckets().getBucket()) {
- for (Action action : bucket.getAction()) {
- //chained-port
+ Buckets buckets = group.getBuckets();
+ List<Bucket> bucketList = (buckets == null)
+ ? null : buckets.getBucket();
+ if (bucketList == null) {
+ bucketList = Collections.<Bucket>emptyList();
+ }
+ for (Bucket bucket : bucketList) {
+ List<Action> actions = bucket.getAction();
+ if (actions == null) {
+ actions = Collections.<Action>emptyList();
+ }
+ for (Action action : actions) {
+ //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;
}
else if (action.getAction().getImplementedInterface().getName()
.equals("org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase")) {
Long groupId = ((GroupActionCase) (action.getAction())).getGroupAction().getGroupId();
- if (!alreadyInstalledGroupids.contains(groupId)) {
+ ListenableFuture<?> future =
+ groupFutures.get(groupId);
+ if (future == null) {
okToInstall = false;
break;
}
+
+ // Need to ensure that the group specified
+ // by group-action is already installed.
+ awaitGroup(sNode, future);
}
}
- if (!okToInstall){
+ if (!okToInstall) {
//increment retry counter value
- counter.incrementAndGet();
+ counter++;
break;
}
-
-
-
}
-
if (okToInstall) {
- final KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
- nodeIdent.child(Group.class, group.getKey());
- this.provider.getGroupCommiter().add(groupIdent, group, nodeIdent);
- alreadyInstalledGroupids.add(group.getGroupId().getValue());
+ addGroup(groupFutures, group);
iterator.remove();
// resetting the counter to zero
- counter.set(0);
+ counter = 0;
}
}
}
/* 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.getReconciliationRetryCount());
+ addGroup(groupFutures, group);
+ }
}
- }
/* 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);
+ }
+
+ // Need to wait for all groups to be installed before adding
+ // flows.
+ awaitGroups(sNode, groupFutures.values());
+
/* 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();
+ }
+
+ /**
+ * Invoke add-group RPC, and put listenable future associated with the
+ * RPC into the given map.
+ *
+ * @param map The map to store listenable futures associated with
+ * add-group RPC.
+ * @param group The group to add.
+ */
+ private void addGroup(Map<Long, ListenableFuture<?>> map, Group group) {
+ KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
+ nodeIdentity.child(Group.class, group.getKey());
+ final Long groupId = group.getGroupId().getValue();
+ ListenableFuture<?> future = JdkFutureAdapters.listenInPoolThread(
+ provider.getGroupCommiter().add(
+ groupIdent, group, nodeIdentity));
+
+ Futures.addCallback(future, new FutureCallback<Object>() {
+ @Override
+ public void onSuccess(Object result) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("add-group RPC completed: node={}, id={}",
+ nodeIdentity.firstKeyOf(Node.class).getId().
+ getValue(), groupId);
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable cause) {
+ String msg = "add-group RPC failed: node=" +
+ nodeIdentity.firstKeyOf(Node.class).getId().getValue() +
+ ", id=" + groupId;
+ LOG.error(msg, cause);
+ }
+ });
+
+ map.put(groupId, future);
+ }
+
+ /**
+ * Wait for completion of add-group RPC.
+ *
+ * @param nodeId The identifier for the target node.
+ * @param future Future associated with add-group RPC that installs
+ * the target group.
+ */
+ private void awaitGroup(String nodeId, ListenableFuture<?> future) {
+ awaitGroups(nodeId, Collections.singleton(future));
+ }
+
+ /**
+ * Wait for completion of add-group RPCs.
+ *
+ * @param nodeId The identifier for the target node.
+ * @param futures A collection of futures associated with add-group
+ * RPCs.
+ */
+ private void awaitGroups(String nodeId,
+ Collection<ListenableFuture<?>> futures) {
+ if (!futures.isEmpty()) {
+ long timeout = Math.min(
+ ADD_GROUP_TIMEOUT * futures.size(), MAX_ADD_GROUP_TIMEOUT);
+ try {
+ Futures.successfulAsList(futures).
+ get(timeout, TimeUnit.NANOSECONDS);
+ LOG.trace("awaitGroups() completed: node={}", nodeId);
+ } catch (TimeoutException e) {
+ LOG.warn("add-group RPCs did not complete: node={}",
+ nodeId);
+ } catch (Exception e) {
+ LOG.error("Unhandled exception while waiting for group installation on node {}",
+ nodeId, e);
+ }
+ }
+ }
}
- 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();
private void deleteDSStaleFlows(List<InstanceIdentifier<StaleFlow>> flowsForBulkDelete){
ImmutableList.Builder<InstanceIdentifier<StaleFlow>> builder = ImmutableList.builder();
- ImmutableList<InstanceIdentifier<StaleFlow>> bulkDelFlows = builder.addAll(flowsForBulkDelete.iterator()).build();
WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
private void deleteDSStaleGroups(List<InstanceIdentifier<StaleGroup>> groupsForBulkDelete){
ImmutableList.Builder<InstanceIdentifier<StaleGroup>> builder = ImmutableList.builder();
- ImmutableList<InstanceIdentifier<StaleGroup>> bulkDelGroups = builder.addAll(groupsForBulkDelete.iterator()).build();
WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
private void deleteDSStaleMeters(List<InstanceIdentifier<StaleMeter>> metersForBulkDelete){
ImmutableList.Builder<InstanceIdentifier<StaleMeter>> builder = ImmutableList.builder();
- ImmutableList<InstanceIdentifier<StaleMeter>> bulkDelGroups = builder.addAll(metersForBulkDelete.iterator()).build();
WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
private void handleStaleEntityDeletionResultFuture(CheckedFuture<Void, TransactionCommitFailedException> submitFuture) {
Futures.addCallback(submitFuture, new FutureCallback<Void>() {
@Override
- public void onSuccess(Void result) { LOG.debug("Stale entity removal success");
+ public void onSuccess(Void result) {
+ LOG.debug("Stale entity removal success");
}
@Override
LOG.error("Stale entity removal failed {}", t);
}
});
-
- }
-
-
- private boolean compareInstanceIdentifierTail(InstanceIdentifier<?> identifier1,
- InstanceIdentifier<?> identifier2) {
- return Iterables.getLast(identifier1.getPathArguments()).equals(Iterables.getLast(identifier2.getPathArguments()));
}
}
Code Review / openflowplugin.git / blobdiff