X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=benchmark%2Fdsbenchmark%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fdsbenchmark%2FDsbenchmarkProvider.java;h=32f849596e16ca52f84959b89a92fdc704ec981b;hb=HEAD;hp=467f35cf60bac07bec384ae86d2afd8299ba687c;hpb=46c19a388a9b63622376ff2e3f051486df9be39c;p=controller.git diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java index 467f35cf60..32f849596e 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/DsbenchmarkProvider.java @@ -7,15 +7,16 @@ */ package org.opendaylight.dsbenchmark; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.Collections; -import java.util.concurrent.Future; +import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -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.controller.md.sal.dom.api.DOMDataBroker; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Singleton; import org.opendaylight.dsbenchmark.listener.DsbenchmarkListenerProvider; import org.opendaylight.dsbenchmark.simpletx.SimpletxBaDelete; import org.opendaylight.dsbenchmark.simpletx.SimpletxBaRead; @@ -29,7 +30,16 @@ import org.opendaylight.dsbenchmark.txchain.TxchainBaWrite; import org.opendaylight.dsbenchmark.txchain.TxchainDomDelete; import org.opendaylight.dsbenchmark.txchain.TxchainDomRead; import org.opendaylight.dsbenchmark.txchain.TxchainDomWrite; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.DsbenchmarkService; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBroker; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStore; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreOutput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.CleanupStoreOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTest; 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.StartTestOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestOutputBuilder; @@ -38,67 +48,82 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchm import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatus; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatus.ExecStatus; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestStatusBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.test.exec.OuterList; +import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; +import org.osgi.service.component.annotations.RequireServiceComponentRuntime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { - +@Singleton +@Component(service = { }) +@RequireServiceComponentRuntime +public final class DsbenchmarkProvider implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(DsbenchmarkProvider.class); - private static final InstanceIdentifier TEST_EXEC_IID = - InstanceIdentifier.builder(TestExec.class).build(); - private static final InstanceIdentifier TEST_STATUS_IID = - InstanceIdentifier.builder(TestStatus.class).build(); + private static final InstanceIdentifier TEST_EXEC_IID = InstanceIdentifier.create(TestExec.class); + private static final InstanceIdentifier TEST_STATUS_IID = InstanceIdentifier.create(TestStatus.class); private final AtomicReference execStatus = new AtomicReference<>(ExecStatus.Idle); - private final DsbenchmarkListenerProvider listenerProvider = new DsbenchmarkListenerProvider(); - private final DOMDataBroker domDataBroker; // Async DOM Broker for use with all DOM operations - private final DataBroker txChainDataBroker; // Async Binding-Aware Broker for use in tx chains; initialized to - // ping-pong broker in default config (see default-config.xml and - // dsbenchmark-impl.yang) - private final DataBroker simpleTxDataBroker; // "Legacy" OSGI Data Broker for use in simple transactions + private final DsbenchmarkListenerProvider listenerProvider; + // Async DOM Broker for use with all DOM operations + private final DOMDataBroker domDataBroker; + // Async Binding-Aware Broker for use in tx chains; + private final DataBroker dataBroker; + private final Registration rpcReg; private long testsCompleted = 0; - public DsbenchmarkProvider(final DOMDataBroker domDataBroker, final DataBroker txChainDataBroker, - final DataBroker simpleTxDataBroker) { - this.domDataBroker = domDataBroker; - this.txChainDataBroker = txChainDataBroker; - this.simpleTxDataBroker = simpleTxDataBroker; - } + @Inject + @Activate + @SuppressWarnings("checkstyle:illegalCatch") + public DsbenchmarkProvider(@Reference final DOMDataBroker domDataBroker, @Reference final DataBroker dataBroker, + @Reference final RpcProviderService rpcService) { + this.domDataBroker = requireNonNull(domDataBroker); + this.dataBroker = requireNonNull(dataBroker); + listenerProvider = new DsbenchmarkListenerProvider(dataBroker); - public void init() { - listenerProvider.setDataBroker(simpleTxDataBroker); - setTestOperData(this.execStatus.get(), testsCompleted); + try { + // We want to set the initial operation status so users can detect we are ready to start test. + setTestOperData(execStatus.get(), testsCompleted); + } catch (final Exception e) { + // TODO: Use a singleton service to make sure the initial write is performed only once. + LOG.warn("Working around Bugs 8829 and 6793 by ignoring exception from setTestOperData", e); + } + rpcReg = rpcService.registerRpcImplementations((StartTest) this::startTest, (CleanupStore) this::cleanupStore); LOG.info("DsbenchmarkProvider initiated"); } @Override + @PreDestroy + @Deactivate public void close() { + rpcReg.close(); LOG.info("DsbenchmarkProvider closed"); } - @Override - public Future> cleanupStore() { + private ListenableFuture> cleanupStore(final CleanupStoreInput input) { cleanupTestStore(); LOG.debug("Data Store cleaned up"); - return Futures.immediateFuture( RpcResultBuilder.success().build()); + return Futures.immediateFuture(RpcResultBuilder.success(new CleanupStoreOutputBuilder().build()).build()); } - @Override - public Future> startTest(final StartTestInput input) { + @SuppressWarnings("checkstyle:illegalCatch") + private ListenableFuture> startTest(final StartTestInput input) { LOG.info("Starting the data store benchmark test, input: {}", input); // Check if there is a test in progress - if ( execStatus.compareAndSet(ExecStatus.Idle, ExecStatus.Executing) == false ) { + if (!execStatus.compareAndSet(ExecStatus.Idle, ExecStatus.Executing)) { LOG.info("Test in progress"); return RpcResultBuilder.success(new StartTestOutputBuilder() - .setStatus(StartTestOutput.Status.TESTINPROGRESS) - .build()).buildFuture(); + .setStatus(StartTestOutput.Status.TESTINPROGRESS) + .build()).buildFuture(); } // Cleanup data that may be left over from a previous test run @@ -110,32 +135,32 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { // Create listeners on OPERATIONAL and CONFIG test data subtrees listenerProvider.createAndRegisterListeners(input.getListeners().intValue()); - long startTime, endTime, listCreateTime, execTime; - startTime = System.nanoTime(); + long startTime = System.nanoTime(); dsWriter.createList(); - endTime = System.nanoTime(); - listCreateTime = (endTime - startTime) / 1000; + long endTime = System.nanoTime(); + final long listCreateTime = (endTime - startTime) / 1000; // Run the test and measure the execution time + long execTime; try { startTime = System.nanoTime(); dsWriter.executeList(); endTime = System.nanoTime(); execTime = (endTime - startTime) / 1000; - this.testsCompleted++; + testsCompleted++; } catch (final Exception e) { - LOG.error( "Test error: {}", e.toString()); - execStatus.set( ExecStatus.Idle ); + LOG.error("Test error", e); + execStatus.set(ExecStatus.Idle); return RpcResultBuilder.success(new StartTestOutputBuilder() - .setStatus(StartTestOutput.Status.FAILED) - .build()).buildFuture(); + .setStatus(StartTestOutput.Status.FAILED) + .build()).buildFuture(); } LOG.info("Test finished"); - setTestOperData( ExecStatus.Idle, testsCompleted); + setTestOperData(ExecStatus.Idle, testsCompleted); execStatus.set(ExecStatus.Idle); // Get the number of data change events and cleanup the data change listeners @@ -146,27 +171,27 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { .setStatus(StartTestOutput.Status.OK) .setListBuildTime(listCreateTime) .setExecTime(execTime) - .setTxOk((long)dsWriter.getTxOk()) - .setNtfOk(numEvents) - .setDataChangeEventsOk(numDataChanges) - .setTxError((long)dsWriter.getTxError()) + .setTxOk(Uint32.valueOf(dsWriter.getTxOk())) + .setNtfOk(Uint32.valueOf(numEvents)) + .setDataChangeEventsOk(Uint32.valueOf(numDataChanges)) + .setTxError(Uint32.valueOf(dsWriter.getTxError())) .build(); return RpcResultBuilder.success(output).buildFuture(); } - private void setTestOperData( final ExecStatus sts, final long tstCompl ) { + private void setTestOperData(final ExecStatus sts, final long tstCompl) { TestStatus status = new TestStatusBuilder() .setExecStatus(sts) - .setTestsCompleted(tstCompl) + .setTestsCompleted(Uint32.valueOf(tstCompl)) .build(); - WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction(); + WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.put(LogicalDatastoreType.OPERATIONAL, TEST_STATUS_IID, status); try { - tx.submit().checkedGet(); - } catch (final TransactionCommitFailedException e) { + tx.commit().get(); + } catch (final InterruptedException | ExecutionException e) { throw new IllegalStateException(e); } @@ -174,26 +199,24 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { } private void cleanupTestStore() { - TestExec data = new TestExecBuilder() - .setOuterList(Collections.emptyList()) - .build(); + TestExec data = new TestExecBuilder().setOuterList(Collections.emptyMap()).build(); - WriteTransaction tx = simpleTxDataBroker.newWriteOnlyTransaction(); + WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.put(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID, data); try { - tx.submit().checkedGet(); + tx.commit().get(); LOG.debug("DataStore config test data cleaned up"); - } catch (final TransactionCommitFailedException e) { + } catch (final InterruptedException | ExecutionException e) { LOG.info("Failed to cleanup DataStore configtest data"); throw new IllegalStateException(e); } - tx = simpleTxDataBroker.newWriteOnlyTransaction(); + tx = dataBroker.newWriteOnlyTransaction(); tx.put(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID, data); try { - tx.submit().checkedGet(); + tx.commit().get(); LOG.debug("DataStore operational test data cleaned up"); - } catch (final TransactionCommitFailedException e) { + } catch (final InterruptedException | ExecutionException e) { LOG.info("Failed to cleanup DataStore operational test data"); throw new IllegalStateException(e); } @@ -216,52 +239,46 @@ public class DsbenchmarkProvider implements DsbenchmarkService, AutoCloseable { if (txType == StartTestInput.TransactionType.SIMPLETX) { if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) { if (StartTestInput.Operation.DELETE == oper) { - retVal = new SimpletxBaDelete(this.simpleTxDataBroker, outerListElem, + retVal = new SimpletxBaDelete(dataBroker, outerListElem, innerListElem,writesPerTx, dataStore); } else if (StartTestInput.Operation.READ == oper) { - retVal = new SimpletxBaRead(this.simpleTxDataBroker, outerListElem, + retVal = new SimpletxBaRead(dataBroker, outerListElem, innerListElem, writesPerTx, dataStore); } else { - retVal = new SimpletxBaWrite(this.simpleTxDataBroker, oper, outerListElem, + retVal = new SimpletxBaWrite(dataBroker, oper, outerListElem, innerListElem, writesPerTx, dataStore); } + } else if (StartTestInput.Operation.DELETE == oper) { + retVal = new SimpletxDomDelete(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new SimpletxDomRead(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); } else { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new SimpletxDomDelete(this.domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new SimpletxDomRead(this.domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else { - retVal = new SimpletxDomWrite(this.domDataBroker, oper, outerListElem, - innerListElem, writesPerTx, dataStore); - } + retVal = new SimpletxDomWrite(domDataBroker, oper, outerListElem, + innerListElem, writesPerTx, dataStore); } - } else { - if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new TxchainBaDelete(this.txChainDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new TxchainBaRead(this.txChainDataBroker,outerListElem, - innerListElem,writesPerTx, dataStore); - } else { - retVal = new TxchainBaWrite(this.txChainDataBroker, oper, outerListElem, - innerListElem, writesPerTx, dataStore); - } + } else if (dataFormat == StartTestInput.DataFormat.BINDINGAWARE) { + if (StartTestInput.Operation.DELETE == oper) { + retVal = new TxchainBaDelete(dataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new TxchainBaRead(dataBroker, outerListElem, + innerListElem,writesPerTx, dataStore); } else { - if (StartTestInput.Operation.DELETE == oper) { - retVal = new TxchainDomDelete(this.domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - } else if (StartTestInput.Operation.READ == oper) { - retVal = new TxchainDomRead(this.domDataBroker, outerListElem, - innerListElem, writesPerTx, dataStore); - - } else { - retVal = new TxchainDomWrite(this.domDataBroker, oper, outerListElem, - innerListElem,writesPerTx, dataStore); - } + retVal = new TxchainBaWrite(dataBroker, oper, outerListElem, + innerListElem, writesPerTx, dataStore); } + } else if (StartTestInput.Operation.DELETE == oper) { + retVal = new TxchainDomDelete(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + } else if (StartTestInput.Operation.READ == oper) { + retVal = new TxchainDomRead(domDataBroker, outerListElem, + innerListElem, writesPerTx, dataStore); + + } else { + retVal = new TxchainDomWrite(domDataBroker, oper, outerListElem, + innerListElem,writesPerTx, dataStore); } } finally { execStatus.set(ExecStatus.Idle);