From a1a4c87228915e5d5a0b9724d7d452047c898ee0 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Tue, 1 Apr 2014 17:23:37 +0200 Subject: [PATCH 1/1] Bug 508: Fixed concurrent conflicting commits by InventoryManager. Change-Id: I0514b26e6ccdf456ec8ffb570056db43cebc89d0 Signed-off-by: Tony Tkacik --- .../FlowCapableInventoryProvider.xtend | 73 +------- .../inventory/manager/NodeChangeCommiter.java | 159 ++++++++++++++++++ 2 files changed, 160 insertions(+), 72 deletions(-) create mode 100644 opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java diff --git a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend index 43f48a50e5..ec8da8693f 100644 --- a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend +++ b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend @@ -60,75 +60,4 @@ class FlowCapableInventoryProvider implements AutoCloseable { listenerRegistration?.close(); } -} - -class NodeChangeCommiter implements OpendaylightInventoryListener { - - static val LOG = LoggerFactory.getLogger(NodeChangeCommiter); - - @Property - val FlowCapableInventoryProvider manager; - - new(FlowCapableInventoryProvider manager) { - _manager = manager; - } - - override onNodeConnectorRemoved(NodeConnectorRemoved connector) { - val ref = connector.nodeConnectorRef; - - // Check path - val it = manager.startChange() - - LOG.debug("removing node connector : " + ref.value.toString()); - - removeOperationalData(ref.value as InstanceIdentifier); - commit() - } - - override onNodeConnectorUpdated(NodeConnectorUpdated connector) { - val ref = connector.nodeConnectorRef; - - val flowConnector = connector.getAugmentation(FlowCapableNodeConnectorUpdated); - - val it = manager.startChange() - val data = new NodeConnectorBuilder(connector); - data.key = (new NodeConnectorKey(connector.id)) - if (flowConnector != null) { - val augment = flowConnector.toInventoryAugment() - data.addAugmentation(FlowCapableNodeConnector, augment) - } - - LOG.debug("updating node connector : " + ref.value.toString()); - - putOperationalData(ref.value as InstanceIdentifier, data.build()); - commit() - } - - override onNodeRemoved(NodeRemoved node) { - val ref = node.nodeRef; - val it = manager.startChange() - - LOG.debug("removing node : " + ref.value.toString()); - - removeOperationalData(ref.value as InstanceIdentifier); - commit() - } - - override onNodeUpdated(NodeUpdated node) { - val ref = node.nodeRef; - val flowNode = node.getAugmentation(FlowCapableNodeUpdated); - - val it = manager.startChange() - val data = new NodeBuilder(node); - data.key = (new NodeKey(node.id)) - if (flowNode != null) { - val augment = flowNode.toInventoryAugment(); - data.addAugmentation(FlowCapableNode, augment) - } - - LOG.debug("updating node : " + ref.value.toString()); - - putOperationalData(ref.value as InstanceIdentifier, data.build()) - commit() - } -} +} \ No newline at end of file diff --git a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java new file mode 100644 index 0000000000..ebb3de7dca --- /dev/null +++ b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/NodeChangeCommiter.java @@ -0,0 +1,159 @@ +/** + * Copyright (c) 2013 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, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.inventory.manager; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; +import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; +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.FlowCapableNodeConnectorUpdated; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeUpdated; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRemoved; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorUpdated; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRemoved; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeUpdated; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.OpendaylightInventoryListener; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder; +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.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; +import org.opendaylight.yangtools.yang.common.RpcResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Objects; + +@SuppressWarnings("all") +public class NodeChangeCommiter implements OpendaylightInventoryListener { + private final static Logger LOG = LoggerFactory.getLogger(NodeChangeCommiter.class); + + private final FlowCapableInventoryProvider manager; + + public NodeChangeCommiter(final FlowCapableInventoryProvider manager) { + this.manager = manager; + } + + public FlowCapableInventoryProvider getManager() { + return this.manager; + } + + @Override + public synchronized void onNodeConnectorRemoved(final NodeConnectorRemoved connector) { + + final NodeConnectorRef ref = connector.getNodeConnectorRef(); + final DataModificationTransaction it = this.getManager().startChange(); + NodeChangeCommiter.LOG.debug("removing node connector {} ", ref.getValue()); + it.removeOperationalData(ref.getValue()); + Future> commitResult = it.commit(); + try { + commitResult.get(); + } catch (InterruptedException | ExecutionException e) { + LOG.error("Node Connector {} not removed.", ref.getValue(), e); + } + + } + + @Override + public synchronized void onNodeConnectorUpdated(final NodeConnectorUpdated connector) { + + final NodeConnectorRef ref = connector.getNodeConnectorRef(); + final FlowCapableNodeConnectorUpdated flowConnector = connector + .getAugmentation(FlowCapableNodeConnectorUpdated.class); + final DataModificationTransaction it = this.getManager().startChange(); + final NodeConnectorBuilder data = new NodeConnectorBuilder(connector); + NodeConnectorId id = connector.getId(); + NodeConnectorKey nodeConnectorKey = new NodeConnectorKey(id); + data.setKey(nodeConnectorKey); + boolean notEquals = (!Objects.equal(flowConnector, null)); + if (notEquals) { + final FlowCapableNodeConnector augment = InventoryMapping.toInventoryAugment(flowConnector); + data.addAugmentation(FlowCapableNodeConnector.class, augment); + } + InstanceIdentifier value = ref.getValue(); + String string = value.toString(); + String plus = ("updating node connector : " + string); + NodeChangeCommiter.LOG.debug(plus); + InstanceIdentifier value1 = ref.getValue(); + NodeConnector build = data.build(); + it.putOperationalData((value1), build); + Future> commitResult = it.commit(); + try { + commitResult.get(); + } catch (InterruptedException | ExecutionException e) { + LOG.error("Node Connector {} not updated.", ref.getValue(), e); + } + + } + + @Override + public synchronized void onNodeRemoved(final NodeRemoved node) { + + final NodeRef ref = node.getNodeRef(); + FlowCapableInventoryProvider manager = this.getManager(); + final DataModificationTransaction it = manager.startChange(); + InstanceIdentifier value = ref.getValue(); + String string = value.toString(); + String plus = ("removing node : " + string); + NodeChangeCommiter.LOG.debug(plus); + InstanceIdentifier value1 = ref.getValue(); + it.removeOperationalData((value1)); + Future> commitResult = it.commit(); + try { + commitResult.get(); + } catch (InterruptedException | ExecutionException e) { + LOG.error("Node {} not removed.", ref.getValue(), e); + } + } + + @Override + public synchronized void onNodeUpdated(final NodeUpdated node) { + + final NodeRef ref = node.getNodeRef(); + final FlowCapableNodeUpdated flowNode = node + . getAugmentation(FlowCapableNodeUpdated.class); + FlowCapableInventoryProvider manager = this.getManager(); + final DataModificationTransaction it = manager.startChange(); + NodeBuilder nodeBuilder = new NodeBuilder(node); + final NodeBuilder data = nodeBuilder; + NodeId id = node.getId(); + NodeKey nodeKey = new NodeKey(id); + data.setKey(nodeKey); + boolean equals = Objects.equal(flowNode, null); + if (equals) { + return; + } + final FlowCapableNode augment = InventoryMapping.toInventoryAugment(flowNode); + data.addAugmentation(FlowCapableNode.class, augment); + InstanceIdentifier value = ref.getValue(); + InstanceIdentifierBuilder builder = InstanceIdentifier. builder(((InstanceIdentifier) value)); + InstanceIdentifierBuilder augmentation = builder + . augmentation(FlowCapableNode.class); + final InstanceIdentifier path = augmentation.build(); + NodeChangeCommiter.LOG.debug("updating node :{} ", path); + it.putOperationalData(path, augment); + + Future> commitResult = it.commit(); + try { + commitResult.get(); + } catch (InterruptedException | ExecutionException e) { + LOG.error("Node {} not updated.", ref.getValue(), e); + } + + } +} -- 2.36.6