X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=benchmark%2Fdsbenchmark%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fdsbenchmark%2Ftxchain%2FTxchainDomDelete.java;h=75dee6267346960e00ddc8480b8f243043fbf5be;hb=4b59df006c79ffb8119152e5a8bc6aadd276c031;hp=b1df83e46e03d186013fd826439ad3fb73c90ba5;hpb=bc740310bca93dcefcf546f7c4a627d8153b3739;p=controller.git diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java index b1df83e46e..75dee62673 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomDelete.java @@ -5,19 +5,21 @@ * 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.dsbenchmark.txchain; -import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChain; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.MoreExecutors; +import java.util.concurrent.ExecutionException; import org.opendaylight.dsbenchmark.DatastoreAbstractWriter; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBroker; +import org.opendaylight.mdsal.dom.api.DOMDataTreeTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList; import org.opendaylight.yangtools.yang.common.QName; @@ -26,63 +28,61 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; - -public class TxchainDomDelete extends DatastoreAbstractWriter implements TransactionChainListener{ - private static final Logger LOG = LoggerFactory.getLogger(TxchainBaWrite.class); +public class TxchainDomDelete extends DatastoreAbstractWriter implements DOMTransactionChainListener { + private static final Logger LOG = LoggerFactory.getLogger(TxchainDomDelete.class); private final DOMDataBroker domDataBroker; - public TxchainDomDelete(DOMDataBroker domDataBroker, int outerListElem, int innerListElem, long writesPerTx) { - super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx); + public TxchainDomDelete(final DOMDataBroker domDataBroker, final int outerListElem, final int innerListElem, + final long writesPerTx, final DataStore dataStore) { + super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore); this.domDataBroker = domDataBroker; - LOG.info("Created TxchainDomDelete"); + LOG.debug("Created TxchainDomDelete"); } @Override public void createList() { - LOG.info("TxchainDomDelete: creating data in the data store"); + LOG.debug("TxchainDomDelete: creating data in the data store"); // Dump the whole list into the data store in a single transaction // with PUTs on the transaction - TxchainDomWrite dd = new TxchainDomWrite(domDataBroker, - StartTestInput.Operation.PUT, - outerListElem, - innerListElem, - outerListElem); + TxchainDomWrite dd = new TxchainDomWrite(domDataBroker, StartTestInput.Operation.PUT, outerListElem, + innerListElem, outerListElem, dataStore); dd.createList(); dd.executeList(); } @Override public void executeList() { + final LogicalDatastoreType dsType = getDataStoreType(); + final org.opendaylight.yangtools.yang.common.QName olId = QName.create(OuterList.QNAME, "id"); + final YangInstanceIdentifier pid = + YangInstanceIdentifier.builder().node(TestExec.QNAME).node(OuterList.QNAME).build(); + final DOMTransactionChain chain = domDataBroker.createMergingTransactionChain(this); + + DOMDataTreeWriteTransaction tx = chain.newWriteOnlyTransaction(); int txSubmitted = 0; int writeCnt = 0; - org.opendaylight.yangtools.yang.common.QName OL_ID = QName.create(OuterList.QNAME, "id"); - DOMTransactionChain chain = domDataBroker.createTransactionChain(this); - DOMDataWriteTransaction tx = chain.newWriteOnlyTransaction(); - - YangInstanceIdentifier pid = YangInstanceIdentifier.builder().node(TestExec.QNAME).node(OuterList.QNAME).build(); for (int l = 0; l < outerListElem; l++) { - YangInstanceIdentifier yid = pid.node(new NodeIdentifierWithPredicates(OuterList.QNAME, OL_ID, l)); - tx.delete(LogicalDatastoreType.CONFIGURATION, yid); + YangInstanceIdentifier yid = pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, olId, l)); + tx.delete(dsType, yid); writeCnt++; if (writeCnt == writesPerTx) { txSubmitted++; - Futures.addCallback(tx.submit(), new FutureCallback() { + tx.commit().addCallback(new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { txOk++; } + @Override - public void onFailure(final Throwable t) { - LOG.error("Transaction failed, {}", t); + public void onFailure(final Throwable cause) { + LOG.error("Transaction failed", cause); txError++; } - }); + }, MoreExecutors.directExecutor()); tx = chain.newWriteOnlyTransaction(); writeCnt = 0; } @@ -93,30 +93,28 @@ public class TxchainDomDelete extends DatastoreAbstractWriter implements Transac // We need to empty the transaction chain before closing it try { txSubmitted++; - tx.submit().checkedGet(); + tx.commit().get(); txOk++; - } catch (TransactionCommitFailedException e) { + } catch (final InterruptedException | ExecutionException e) { LOG.error("Transaction failed", e); txError++; } try { chain.close(); - } - catch (IllegalStateException e){ + } catch (final IllegalStateException e) { LOG.error("Transaction close failed,", e); } - LOG.info("Transactions: submitted {}, completed {}", txSubmitted, (txOk + txError)); + LOG.debug("Transactions: submitted {}, completed {}", txSubmitted, txOk + txError); } @Override - public void onTransactionChainFailed(TransactionChain chain, - AsyncTransaction transaction, Throwable cause) { - LOG.error("Broken chain {} in TxchainDomDelete, transaction {}, cause {}", - chain, transaction.getIdentifier(), cause); + public void onTransactionChainFailed(final DOMTransactionChain chain, final DOMDataTreeTransaction transaction, + final Throwable cause) { + LOG.error("Broken chain {} in TxchainDomDelete, transaction {}", chain, transaction.getIdentifier(), cause); } @Override - public void onTransactionChainSuccessful(TransactionChain chain) { - LOG.info("TxchainDomDelete closed successfully, chain {}", chain); + public void onTransactionChainSuccessful(final DOMTransactionChain chain) { + LOG.debug("TxchainDomDelete closed successfully, chain {}", chain); } }