X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ffrm%2Fimpl%2FFlowNodeReconciliationImpl.java;h=5b5933efb940059d2f8646ee23cc659a8d90f5c6;hb=ab48afdf8678dd131c771921dfa9d89554b9c50a;hp=0e4780d8d34fdbbe5bb481cf9c6d968a96301d78;hpb=8b749b999c47342e61c6a6d73dcb03780ede3250;p=openflowplugin.git
diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
index 0e4780d8d3..5b5933efb9 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.applications.frm.impl;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.FutureCallback;
@@ -102,27 +101,28 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Default implementation of {@link ForwardingRulesManager}
+ * Default implementation of {@link ForwardingRulesManager}.
*
* @author Vaclav Demcak
*/
public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
- 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 static final Logger LOG = LoggerFactory.getLogger(FlowNodeReconciliationImpl.class);
- //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);
+ // The number of nanoseconds to wait for a single group to be added.
+ private static final long ADD_GROUP_TIMEOUT = TimeUnit.SECONDS.toNanos(3);
+
+ // 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;
private final String serviceName;
- final private int priority;
- final private ResultState resultState;
- private Map> futureMap = new HashMap<>();
+ private final int priority;
+ private final ResultState resultState;
+ private final Map> futureMap = new HashMap<>();
private final ExecutorService executor = Executors.newFixedThreadPool(THREAD_POOL_SIZE);
@@ -131,14 +131,15 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
private static final AtomicLong BUNDLE_ID = new AtomicLong();
private static final BundleFlags BUNDLE_FLAGS = new BundleFlags(true, true);
- public FlowNodeReconciliationImpl (final ForwardingRulesManager manager, final DataBroker db,
+ public FlowNodeReconciliationImpl(final ForwardingRulesManager manager, final DataBroker db,
final String serviceName, final int priority, final ResultState resultState) {
this.provider = Preconditions.checkNotNull(manager, "ForwardingRulesManager can not be null!");
dataBroker = Preconditions.checkNotNull(db, "DataBroker can not be null!");
this.serviceName = serviceName;
this.priority = priority;
this.resultState = resultState;
- salBundleService = Preconditions.checkNotNull(manager.getSalBundleService(),"salBundleService can not be null!");
+ salBundleService = Preconditions.checkNotNull(manager.getSalBundleService(),
+ "salBundleService can not be null!");
}
@Override
@@ -151,12 +152,12 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
private ListenableFuture reconcileConfiguration(InstanceIdentifier 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 {}",
+ LOG.info("Stale-Marking is ENABLED and proceeding with deletion of " + "stale-marked entities on switch {}",
connectedNode.toString());
reconciliationPreProcess(connectedNode);
}
- LOG.debug("Bundle based reconciliation status : {}", provider.isBundleBasedReconciliationEnabled()?"Enable":"Disable");
+ LOG.debug("Bundle based reconciliation status : {}",
+ provider.isBundleBasedReconciliationEnabled() ? "Enable" : "Disable");
if (provider.isBundleBasedReconciliationEnabled()) {
BundleBasedReconciliationTask bundleBasedReconTask = new BundleBasedReconciliationTask(connectedNode);
return JdkFutureAdapters.listenInPoolThread(executor.submit(bundleBasedReconTask));
@@ -169,98 +170,88 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
private class BundleBasedReconciliationTask implements Callable {
final InstanceIdentifier nodeIdentity;
- public BundleBasedReconciliationTask(final InstanceIdentifier nodeIdent) {
+ BundleBasedReconciliationTask(final InstanceIdentifier nodeIdent) {
nodeIdentity = nodeIdent;
}
@Override
public Boolean call() {
- String sNode = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
+ String node = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
Optional flowNode = Optional.absent();
BundleId bundleIdValue = new BundleId(BUNDLE_ID.getAndIncrement());
- BigInteger nDpId = getDpnIdFromNodeName(sNode);
- LOG.debug("Triggering bundle based reconciliation for device :{}", nDpId);
+ BigInteger dpnId = getDpnIdFromNodeName(node);
+ LOG.debug("Triggering bundle based reconciliation for device :{}", dpnId);
ReadOnlyTransaction trans = provider.getReadTranaction();
try {
flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdentity).get();
- } catch (Exception e) {
+ } catch (ExecutionException | InterruptedException e) {
LOG.error("Error occurred while reading the configuration data store for node {}", nodeIdentity, e);
}
if (flowNode.isPresent()) {
- LOG.debug("FlowNode present for Datapath ID {}", nDpId);
+ LOG.debug("FlowNode present for Datapath ID {}", dpnId);
final NodeRef nodeRef = new NodeRef(nodeIdentity.firstIdentifierOf(Node.class));
- final ControlBundleInput openBundleInput = new ControlBundleInputBuilder()
- .setNode(nodeRef)
- .setBundleId(bundleIdValue)
- .setFlags(BUNDLE_FLAGS)
- .setType(BundleControlType.ONFBCTOPENREQUEST)
+ final ControlBundleInput openBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
+ .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS).setType(BundleControlType.ONFBCTOPENREQUEST)
.build();
- final ControlBundleInput commitBundleInput = new ControlBundleInputBuilder()
- .setNode(nodeRef)
- .setBundleId(bundleIdValue)
- .setFlags(BUNDLE_FLAGS)
- .setType(BundleControlType.ONFBCTCOMMITREQUEST)
- .build();
+ final ControlBundleInput commitBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
+ .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
+ .setType(BundleControlType.ONFBCTCOMMITREQUEST).build();
final AddBundleMessagesInput addBundleMessagesInput = new AddBundleMessagesInputBuilder()
- .setNode(nodeRef)
- .setBundleId(bundleIdValue)
- .setFlags(BUNDLE_FLAGS)
- .setMessages(createMessages(nodeRef, flowNode))
- .build();
+ .setNode(nodeRef).setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
+ .setMessages(createMessages(nodeRef, flowNode)).build();
Future> openBundle = salBundleService.controlBundle(openBundleInput);
- ListenableFuture> addBundleMessagesFuture =
- Futures.transformAsync(JdkFutureAdapters.listenInPoolThread(openBundle), rpcResult -> {
+ ListenableFuture> addBundleMessagesFuture = Futures
+ .transformAsync(JdkFutureAdapters.listenInPoolThread(openBundle), rpcResult -> {
if (rpcResult.isSuccessful()) {
- return JdkFutureAdapters.listenInPoolThread(
- salBundleService.addBundleMessages(addBundleMessagesInput));
+ return JdkFutureAdapters
+ .listenInPoolThread(salBundleService.addBundleMessages(addBundleMessagesInput));
}
return Futures.immediateFuture(null);
});
-
- ListenableFuture> commitBundleFuture =
- Futures.transformAsync(addBundleMessagesFuture, rpcResult -> {
- if (rpcResult.isSuccessful()) {
- return JdkFutureAdapters.listenInPoolThread(
- salBundleService.controlBundle(commitBundleInput));
- }
- return Futures.immediateFuture(null);
- });
-
- /* Bundles not supported for meters*/
- List meters = flowNode.get().getMeter() != null
- ? flowNode.get().getMeter() : Collections.emptyList();
- ListenableFuture> meterFuture =
- Futures.transformAsync(commitBundleFuture, rpcResult -> {
- if (rpcResult.isSuccessful()) {
- for (Meter meter : meters) {
- final KeyedInstanceIdentifier meterIdent =
- nodeIdentity.child(Meter.class, meter.getKey());
- provider.getMeterCommiter().add(meterIdent, meter, nodeIdentity);
- }
- }
- return Futures.immediateFuture(null);
- });
-
- trans.close();
- try {
- if(commitBundleFuture.get().isSuccessful()) {
- LOG.debug("Completing bundle based reconciliation for device ID:{}", nDpId);
- return true;
- } else {
- return false;
+ ListenableFuture> commitBundleFuture = Futures.transformAsync(addBundleMessagesFuture,
+ rpcResult -> {
+ if (rpcResult.isSuccessful()) {
+ return JdkFutureAdapters
+ .listenInPoolThread(salBundleService.controlBundle(commitBundleInput));
+ }
+ return Futures.immediateFuture(null);
+ });
+
+ /* Bundles not supported for meters */
+ List meters = flowNode.get().getMeter() != null ? flowNode.get().getMeter()
+ : Collections.emptyList();
+ Futures.transformAsync(commitBundleFuture,
+ rpcResult -> {
+ if (rpcResult.isSuccessful()) {
+ for (Meter meter : meters) {
+ final KeyedInstanceIdentifier meterIdent = nodeIdentity
+ .child(Meter.class, meter.getKey());
+ provider.getMeterCommiter().add(meterIdent, meter, nodeIdentity);
}
- } catch (InterruptedException | ExecutionException e) {
- LOG.error("Error while doing bundle based reconciliation for device ID:{}", nodeIdentity);
- return false;
}
+ return Futures.immediateFuture(null);
+ });
+
+ trans.close();
+ try {
+ if (commitBundleFuture.get().isSuccessful()) {
+ LOG.debug("Completing bundle based reconciliation for device ID:{}", dpnId);
+ return true;
+ } else {
+ return false;
+ }
+ } catch (InterruptedException | ExecutionException e) {
+ LOG.error("Error while doing bundle based reconciliation for device ID:{}", nodeIdentity);
+ return false;
+ }
}
- LOG.error("FlowNode not present for Datapath ID {}", nDpId);
+ LOG.error("FlowNode not present for Datapath ID {}", dpnId);
return false;
}
}
@@ -298,51 +289,57 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
InstanceIdentifier nodeIdentity;
- public ReconciliationTask(final InstanceIdentifier nodeIdent) {
- nodeIdentity = nodeIdent;
+ ReconciliationTask(final InstanceIdentifier nodeIdent) {
+ nodeIdentity = nodeIdent;
}
+ @Override
public Boolean call() {
- String sNode = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
- BigInteger nDpId = getDpnIdFromNodeName(sNode);
+ String node = nodeIdentity.firstKeyOf(Node.class, NodeKey.class).getId().getValue();
+ BigInteger dpnId = getDpnIdFromNodeName(node);
ReadOnlyTransaction trans = provider.getReadTranaction();
Optional flowNode = Optional.absent();
- //initialize the counter
+ // initialize the counter
int counter = 0;
try {
flowNode = trans.read(LogicalDatastoreType.CONFIGURATION, nodeIdentity).get();
- } catch (Exception e) {
+ } catch (ExecutionException | InterruptedException e) {
LOG.warn("Fail with read Config/DS for Node {} !", nodeIdentity, e);
return false;
}
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
+ /* Tables - have to be pushed before groups */
+ // CHECK if while pushing the update, updateTableInput can be null to emulate a
+ // table add
List tableList = flowNode.get().getTableFeatures() != null
- ? flowNode.get().getTableFeatures() : Collections.emptyList();
+ ? flowNode.get().getTableFeatures()
+ : Collections.emptyList();
for (TableFeatures tableFeaturesItem : tableList) {
TableFeaturesKey tableKey = tableFeaturesItem.getKey();
- KeyedInstanceIdentifier tableFeaturesII
- = nodeIdentity.child(TableFeatures.class, new TableFeaturesKey(tableKey.getTableId()));
+ KeyedInstanceIdentifier tableFeaturesII = nodeIdentity
+ .child(TableFeatures.class, new TableFeaturesKey(tableKey.getTableId()));
provider.getTableFeaturesCommiter().update(tableFeaturesII, tableFeaturesItem, null, nodeIdentity);
}
- /* Groups - have to be first */
- List groups = flowNode.get().getGroup() != null
- ? flowNode.get().getGroup() : Collections.emptyList();
+ /* Groups - have to be first */
+ List groups = flowNode.get().getGroup() != null ? flowNode.get().getGroup()
+ : Collections.emptyList();
List toBeInstalledGroups = new ArrayList<>();
toBeInstalledGroups.addAll(groups);
- //new list for suspected groups pointing to ports .. when the ports come up late
+ // new list for suspected groups pointing to ports .. when the ports come up
+ // late
List suspectedGroups = new ArrayList<>();
Map> groupFutures = new HashMap<>();
- while ((!(toBeInstalledGroups.isEmpty()) || !(suspectedGroups.isEmpty())) &&
- (counter <= provider.getReconciliationRetryCount())) { //also check if the counter has not crossed the threshold
+ while ((!toBeInstalledGroups.isEmpty() || !suspectedGroups.isEmpty())
+ && counter <= provider.getReconciliationRetryCount()) { // also check if the counter has not
+ // crossed the threshold
if (toBeInstalledGroups.isEmpty() && !suspectedGroups.isEmpty()) {
- LOG.debug("These Groups are pointing to node-connectors that are not up yet {}", suspectedGroups.toString());
+ LOG.debug("These Groups are pointing to node-connectors that are not up yet {}",
+ suspectedGroups.toString());
toBeInstalledGroups.addAll(suspectedGroups);
break;
}
@@ -352,8 +349,7 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
Group group = iterator.next();
boolean okToInstall = true;
Buckets buckets = group.getBuckets();
- List bucketList = (buckets == null)
- ? null : buckets.getBucket();
+ List bucketList = buckets == null ? null : buckets.getBucket();
if (bucketList == null) {
bucketList = Collections.emptyList();
}
@@ -363,54 +359,52 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
actions = Collections.emptyList();
}
for (Action action : actions) {
- //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()))
- .getOutputAction().getOutputNodeConnector().getValue();
+ .equals("org.opendaylight.yang.gen.v1.urn.opendaylight"
+ + ".action.types.rev131112.action.action.OutputActionCase")) {
+ String nodeConnectorUri = ((OutputActionCase) action.getAction()).getOutputAction()
+ .getOutputNodeConnector().getValue();
LOG.debug("Installing the group for node connector {}", nodeConnectorUri);
- //check if the nodeconnector is there in the multimap
+ // check if the nodeconnector is there in the multimap
boolean isPresent = provider.getFlowNodeConnectorInventoryTranslatorImpl()
- .isNodeConnectorUpdated(nDpId, nodeConnectorUri);
- //if yes set okToInstall = true
+ .isNodeConnectorUpdated(dpnId, nodeConnectorUri);
+ // if yes set okToInstall = true
if (isPresent) {
break;
- }//else put it in a different list and still set okToInstall = true
- else {
+ } else {
+ // else put it in a different list and still set okToInstall = true
suspectedGroups.add(group);
- LOG.debug("Not yet received the node-connector updated for {} " +
- "for the group with id {}", nodeConnectorUri, group.getGroupId().toString());
+ LOG.debug(
+ "Not yet received the node-connector updated for {} "
+ + "for the group with id {}",
+ nodeConnectorUri, group.getGroupId().toString());
break;
}
-
-
- }
- //chained groups
- 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();
- ListenableFuture future =
- groupFutures.get(groupId);
+ } else if (action.getAction().getImplementedInterface().getName()
+ .equals("org.opendaylight.yang.gen.v1.urn.opendaylight"
+ + ".action.types.rev131112.action.action.GroupActionCase")) {
+ // chained groups
+ Long groupId = ((GroupActionCase) action.getAction()).getGroupAction().getGroupId();
+ 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);
+ awaitGroup(node, future);
}
}
if (!okToInstall) {
- //increment retry counter value
+ // increment retry counter value
counter++;
break;
}
}
-
if (okToInstall) {
addGroup(groupFutures, group);
iterator.remove();
@@ -420,77 +414,76 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
}
}
- /* installation of suspected groups*/
+ /* installation of suspected groups */
if (!toBeInstalledGroups.isEmpty()) {
for (Group group : toBeInstalledGroups) {
- LOG.debug("Installing the group {} finally although the port is not up after checking for {} times "
- , group.getGroupId().toString(), provider.getReconciliationRetryCount());
+ LOG.debug(
+ "Installing the group {} finally although "
+ + "the port is not up after checking for {} times ",
+ group.getGroupId().toString(), provider.getReconciliationRetryCount());
addGroup(groupFutures, group);
}
}
- /* Meters */
- List meters = flowNode.get().getMeter() != null
- ? flowNode.get().getMeter() : Collections.emptyList();
+ /* Meters */
+ List meters = flowNode.get().getMeter() != null ? flowNode.get().getMeter()
+ : Collections.emptyList();
for (Meter meter : meters) {
- final KeyedInstanceIdentifier meterIdent =
- nodeIdentity.child(Meter.class, meter.getKey());
+ final KeyedInstanceIdentifier 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());
+ awaitGroups(node, groupFutures.values());
- /* Flows */
- List