X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fclustering-test-app%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fit%2Fprovider%2FCarProvider.java;h=d70ac410d1535cfaba967e7b063dc8a7f6962df9;hp=2dfb32b421f3f6e6c7275316091476bb7c69531c;hb=e0d230dfee7bcc7e384e2d8f933854ad449d441e;hpb=11d13dee3de89651199e942c4b8265b93ebdef76 diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java index 2dfb32b421..d70ac410d1 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarProvider.java @@ -9,6 +9,8 @@ package org.opendaylight.controller.clustering.it.provider; import com.google.common.base.Stopwatch; import com.google.common.collect.Sets; +import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import java.util.Collection; import java.util.concurrent.Future; @@ -16,6 +18,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; @@ -28,11 +31,16 @@ import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipS import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; 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 org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.Cars; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.CarsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestOutput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.cars.CarEntry; @@ -42,6 +50,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,30 +60,42 @@ import org.slf4j.LoggerFactory; public class CarProvider implements CarService { private static final Logger log = LoggerFactory.getLogger(PurchaseCarProvider.class); - private final DataBroker dataProvider; - private final EntityOwnershipService ownershipService; private static final Logger LOG = LoggerFactory.getLogger(CarProvider.class); private static final String ENTITY_TYPE = "cars"; - - private final CarEntityOwnershipListener ownershipListener = new CarEntityOwnershipListener(); - private final AtomicBoolean registeredListener = new AtomicBoolean(); - - private volatile Thread testThread; - private volatile boolean stopThread; - private static final InstanceIdentifier CARS_IID = InstanceIdentifier.builder(Cars.class).build(); private static final DataTreeIdentifier CARS_DTID = new DataTreeIdentifier<>( LogicalDatastoreType.CONFIGURATION, CARS_IID); - private Collection> carsDclRegistrations = + private final DataBroker dataProvider; + private final DOMDataBroker domDataBroker; + private final EntityOwnershipService ownershipService; + private final AtomicLong succcessCounter = new AtomicLong(); + private final AtomicLong failureCounter = new AtomicLong(); + + private final CarEntityOwnershipListener ownershipListener = new CarEntityOwnershipListener(); + private final AtomicBoolean registeredListener = new AtomicBoolean(); + + private final Collection> carsDclRegistrations = Sets.newConcurrentHashSet(); - private Collection> carsDtclRegistrations = + private final Collection> carsDtclRegistrations = Sets.newConcurrentHashSet(); - public CarProvider(DataBroker dataProvider, EntityOwnershipService ownershipService) { + private volatile Thread testThread; + private volatile boolean stopThread; + private final AtomicReference> commitCohortReg = + new AtomicReference<>(); + + public CarProvider(DataBroker dataProvider, EntityOwnershipService ownershipService, + DOMDataBroker domDataBroker) { this.dataProvider = dataProvider; this.ownershipService = ownershipService; + this.domDataBroker = domDataBroker; + } + + public void close() { + stopThread(); + unregisterCommitCohort(); } private void stopThread() { @@ -94,11 +115,11 @@ public class CarProvider implements CarService { final long inputCount; // If rate is not provided, or given as zero, then just return. - if ((input.getRate() == null) || (input.getRate() == 0)) { + if (input.getRate() == null || input.getRate() == 0) { log.info("Exiting stress test as no rate is given."); return Futures.immediateFuture(RpcResultBuilder.failed() - .withError(ErrorType.PROTOCOL, "invalid rate") - .build()); + .withError(ErrorType.PROTOCOL, "invalid rate") + .build()); } else { inputRate = input.getRate(); } @@ -112,6 +133,9 @@ public class CarProvider implements CarService { log.info("Stress test starting : rate: {} count: {}", inputRate, inputCount); stopThread(); + // clear counters + succcessCounter.set(0); + failureCounter.set(0); WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); InstanceIdentifier carsId = InstanceIdentifier.builder(Cars.class).build(); @@ -138,19 +162,34 @@ public class CarProvider implements CarService { tx.put(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.builder(Cars.class).child(CarEntry.class, car.getKey()).build(), car); - tx.submit(); + CheckedFuture future = tx.submit(); + Futures.addCallback(future, new FutureCallback() { + + @Override + public void onSuccess(final Void result) { + // Transaction succeeded + succcessCounter.getAndIncrement(); + } + + @Override + public void onFailure(final Throwable t) { + // Transaction failed + failureCounter.getAndIncrement(); + LOG.error("Put Cars failed", t); + } + }); try { TimeUnit.NANOSECONDS.sleep(sleep); } catch (InterruptedException e) { break; } - if((count.get() % 1000) == 0) { + if(count.get() % 1000 == 0) { log.info("Cars created {}, time: {}",count.get(),sw.elapsed(TimeUnit.SECONDS)); } // Check if a count is specified in input and we have created that many cars. - if ((inputCount != 0) && (count.get() >= inputCount)) { + if (inputCount != 0 && count.get() >= inputCount) { stopThread = true; } } @@ -164,9 +203,20 @@ public class CarProvider implements CarService { } @Override - public Future> stopStressTest() { + public Future> stopStressTest() { stopThread(); - return Futures.immediateFuture(RpcResultBuilder.success().build()); + StopStressTestOutputBuilder stopStressTestOutput; + stopStressTestOutput = new StopStressTestOutputBuilder() + .setSuccessCount(succcessCounter.longValue()) + .setFailureCount(failureCounter.longValue()); + + StopStressTestOutput result = stopStressTestOutput.build(); + log.info("Executed Stop Stress test; No. of cars created {}; " + + "No. of cars failed {}; ", succcessCounter, failureCounter); + // clear counters + succcessCounter.set(0); + failureCounter.set(0); + return Futures.immediateFuture(RpcResultBuilder.success(result).build()); } @@ -255,4 +305,54 @@ public class CarProvider implements CarService { } return RpcResultBuilder.success().buildFuture(); } + + @Override + @SuppressWarnings("checkstyle:IllegalCatch") + public Future> unregisterCommitCohort() { + final DOMDataTreeCommitCohortRegistration reg = commitCohortReg.getAndSet(null); + if (reg != null) { + try { + reg.close(); + LOG.info("Unregistered commit cohort"); + } catch (Exception e) { + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, + "Error closing commit cohort registration", e).buildFuture(); + } + } + + return RpcResultBuilder.success().buildFuture(); + } + + @Override + public synchronized Future> registerCommitCohort() { + if (commitCohortReg.get() != null) { + return RpcResultBuilder.success().buildFuture(); + } + + final DOMDataTreeCommitCohortRegistry commitCohortRegistry = (DOMDataTreeCommitCohortRegistry) + domDataBroker.getSupportedExtensions().get(DOMDataTreeCommitCohortRegistry.class); + + if (commitCohortRegistry == null) { + // Shouldn't happen + return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, + "DOMDataTreeCommitCohortRegistry not found").buildFuture(); + } + + // Note: it may look strange that we specify the CarEntry.QNAME twice in the path below. This must be done in + // order to register the commit cohort for CarEntry instances. In the underlying data tree, a yang list is + // represented as a MapNode with MapEntryNodes representing the child list entries. Therefore, in order to + // address a list entry, you must specify the path argument for the MapNode and the path argument for the + // MapEntryNode. In the path below, the first CarEntry.QNAME argument addresses the MapNode and, since we want + // to address all list entries, the second path argument is wild-carded by specifying just the CarEntry.QNAME. + final YangInstanceIdentifier carEntryPath = YangInstanceIdentifier.builder( + YangInstanceIdentifier.of(Cars.QNAME)).node(CarEntry.QNAME).node(CarEntry.QNAME).build(); + commitCohortReg.set(commitCohortRegistry.registerCommitCohort( + new org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier( + org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION, + carEntryPath), new CarEntryDataTreeCommitCohort())); + + LOG.info("Registered commit cohort"); + + return RpcResultBuilder.success().buildFuture(); + } }