X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsamples%2Fclustering-test-app%2Fprovider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fclustering%2Fit%2Fprovider%2FCarProvider.java;h=bec65aa561a3357daf980b58a6f6ebbda36f8db5;hb=1c79e662c75f327e4d1953710cc78b70780ef4e1;hp=13349d95e325b3b1908951043d0c1912700af59a;hpb=f9814cf027886294b74fb6c8748f4a3e0a545e86;p=controller.git 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 13349d95e3..bec65aa561 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 @@ -8,66 +8,84 @@ 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.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; -import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; 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.DataTreeIdentifier; -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 org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry; -import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Singleton; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; +import org.opendaylight.mdsal.binding.api.RpcProviderService; +import org.opendaylight.mdsal.binding.api.WriteTransaction; +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.DOMDataBroker.CommitCohortExtension; +import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.eos.binding.api.Entity; -import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; 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.RegisterCommitCohort; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterCommitCohortOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtcl; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterLoggingDtclOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnership; 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.RegisterOwnershipOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.RegisterOwnershipOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTest; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StopStressTestInput; 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.StressTest; 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.StressTestOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.StressTestOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohort; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterCommitCohortOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtcls; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterLoggingDtclsOutputBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnership; 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.UnregisterOwnershipOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.UnregisterOwnershipOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.cars.CarEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.sal.clustering.it.car.rev140818.cars.CarEntryBuilder; -import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.concepts.ObjectRegistration; +import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; +import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,14 +94,14 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ -public class CarProvider implements CarService { - private static final Logger LOG_PURCHASE_CAR = LoggerFactory.getLogger(PurchaseCarProvider.class); - - private static final Logger LOG_CAR_PROVIDER = LoggerFactory.getLogger(CarProvider.class); +@Singleton +@Component(service = { }) +public final class CarProvider { + private static final Logger LOG = LoggerFactory.getLogger(CarProvider.class); private static final String ENTITY_TYPE = "cars"; private static final InstanceIdentifier CARS_IID = InstanceIdentifier.builder(Cars.class).build(); - private static final DataTreeIdentifier CARS_DTID = new DataTreeIdentifier<>( + private static final DataTreeIdentifier CARS_DTID = DataTreeIdentifier.of( LogicalDatastoreType.CONFIGURATION, CARS_IID); private final DataBroker dataProvider; @@ -92,29 +110,44 @@ public class CarProvider implements CarService { 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 EntityOwnershipListener ownershipListener = (entity, change, inJeopardy) -> + LOG.info("ownershipChanged: entity={} change={} inJeopardy={}", entity, change, inJeopardy); - private final Collection> carsDclRegistrations = - Sets.newConcurrentHashSet(); - private final Collection> carsDtclRegistrations = - Sets.newConcurrentHashSet(); + private final AtomicBoolean registeredListener = new AtomicBoolean(); + private final AtomicReference commitCohortReg = new AtomicReference<>(); + private final Set> carsDclRegistrations = ConcurrentHashMap.newKeySet(); + private final Set regs = new HashSet<>(); + private final Set carsDtclRegistrations = ConcurrentHashMap.newKeySet(); private volatile Thread testThread; private volatile boolean stopThread; - private final AtomicReference> commitCohortReg = - new AtomicReference<>(); - public CarProvider(final DataBroker dataProvider, final EntityOwnershipService ownershipService, - final DOMDataBroker domDataBroker) { + @Inject + @Activate + public CarProvider(@Reference final DataBroker dataProvider, + @Reference final EntityOwnershipService ownershipService, @Reference final DOMDataBroker domDataBroker, + @Reference final RpcProviderService rpcProviderService) { this.dataProvider = dataProvider; this.ownershipService = ownershipService; this.domDataBroker = domDataBroker; + regs.add(rpcProviderService.registerRpcImplementations( + (StressTest) this::stressTest, + (StopStressTest) this::stopStressTest, + (RegisterOwnership) this::registerOwnership, + (UnregisterOwnership) this::unregisterOwnership, + (RegisterLoggingDtcl) this::registerLoggingDtcl, + (UnregisterLoggingDtcls) this::unregisterLoggingDtcls, + (RegisterCommitCohort) this::registerCommitCohort, + (UnregisterCommitCohort) this::unregisterCommitCohort)); } + @PreDestroy + @Deactivate public void close() { stopThread(); closeCommitCohortRegistration(); + regs.forEach(Registration::close); + regs.clear(); } private void stopThread() { @@ -130,27 +163,26 @@ public class CarProvider implements CarService { } } - @Override - public ListenableFuture> stressTest(final StressTestInput input) { + private ListenableFuture> stressTest(final StressTestInput input) { final int inputRate; final long inputCount; // If rate is not provided, or given as zero, then just return. - if (input.getRate() == null || input.getRate() == 0) { - LOG_PURCHASE_CAR.info("Exiting stress test as no rate is given."); + if (input.getRate() == null || input.getRate().toJava() == 0) { + LOG.info("Exiting stress test as no rate is given."); return Futures.immediateFuture(RpcResultBuilder.failed() .withError(ErrorType.PROTOCOL, "invalid rate") .build()); } - inputRate = input.getRate(); + inputRate = input.getRate().toJava(); if (input.getCount() != null) { - inputCount = input.getCount(); + inputCount = input.getCount().toJava(); } else { inputCount = 0; } - LOG_PURCHASE_CAR.info("Stress test starting : rate: {} count: {}", inputRate, inputCount); + LOG.info("Stress test starting : rate: {} count: {}", inputRate, inputCount); stopThread(); // clear counters @@ -161,9 +193,9 @@ public class CarProvider implements CarService { InstanceIdentifier carsId = InstanceIdentifier.create(Cars.class); tx.merge(LogicalDatastoreType.CONFIGURATION, carsId, new CarsBuilder().build()); try { - tx.submit().checkedGet(5, TimeUnit.SECONDS); - } catch (TransactionCommitFailedException | TimeoutException e) { - LOG_PURCHASE_CAR.error("Put Cars failed",e); + tx.commit().get(5, TimeUnit.SECONDS); + } catch (TimeoutException | InterruptedException | ExecutionException e) { + LOG.error("Put Cars failed",e); return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build()); } @@ -179,10 +211,10 @@ public class CarProvider implements CarService { CarEntry car = new CarEntryBuilder().setId(new CarId("car" + id)).build(); tx1.put(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.builder(Cars.class).child(CarEntry.class, car.key()).build(), car); - Futures.addCallback(tx1.submit(), new FutureCallback() { + tx1.commit().addCallback(new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { // Transaction succeeded succcessCounter.getAndIncrement(); } @@ -191,7 +223,7 @@ public class CarProvider implements CarService { public void onFailure(final Throwable ex) { // Transaction failed failureCounter.getAndIncrement(); - LOG_CAR_PROVIDER.error("Put Cars failed", ex); + LOG.error("Put Cars failed", ex); } }, MoreExecutors.directExecutor()); try { @@ -201,7 +233,7 @@ public class CarProvider implements CarService { } if (count.get() % 1000 == 0) { - LOG_PURCHASE_CAR.info("Cars created {}, time: {}", count.get(), sw.elapsed(TimeUnit.SECONDS)); + 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. @@ -210,33 +242,30 @@ public class CarProvider implements CarService { } } - LOG_PURCHASE_CAR.info("Stress test thread stopping after creating {} cars.", count.get()); + LOG.info("Stress test thread stopping after creating {} cars.", count.get()); }); testThread.start(); return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build()); } - @Override - public ListenableFuture> stopStressTest(final StopStressTestInput input) { + private ListenableFuture> stopStressTest(final StopStressTestInput input) { stopThread(); StopStressTestOutputBuilder stopStressTestOutput; stopStressTestOutput = new StopStressTestOutputBuilder() - .setSuccessCount(succcessCounter.longValue()) - .setFailureCount(failureCounter.longValue()); + .setSuccessCount(Uint32.valueOf(succcessCounter.longValue())) + .setFailureCount(Uint32.valueOf(failureCounter.longValue())); final StopStressTestOutput result = stopStressTestOutput.build(); - LOG_PURCHASE_CAR.info("Executed Stop Stress test; No. of cars created {}; " - + "No. of cars failed {}; ", succcessCounter, failureCounter); + 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()); } - - @Override - public ListenableFuture> registerOwnership(final RegisterOwnershipInput input) { + private ListenableFuture> registerOwnership(final RegisterOwnershipInput input) { if (registeredListener.compareAndSet(false, true)) { ownershipService.registerListener(ENTITY_TYPE, ownershipListener); } @@ -252,49 +281,36 @@ public class CarProvider implements CarService { return RpcResultBuilder.success(new RegisterOwnershipOutputBuilder().build()).buildFuture(); } - @Override - public ListenableFuture> unregisterOwnership( + private ListenableFuture> unregisterOwnership( final UnregisterOwnershipInput input) { return RpcResultBuilder.success(new UnregisterOwnershipOutputBuilder().build()).buildFuture(); } - private static class CarEntityOwnershipListener implements EntityOwnershipListener { - @Override - public void ownershipChanged(final EntityOwnershipChange ownershipChange) { - LOG_CAR_PROVIDER.info("ownershipChanged: {}", ownershipChange); - } - } - - @Override - public ListenableFuture> registerLoggingDtcl( + private ListenableFuture> registerLoggingDtcl( final RegisterLoggingDtclInput input) { - LOG_CAR_PROVIDER.info("Registering a new CarDataTreeChangeListener"); - final ListenerRegistration carsDtclRegistration = - dataProvider.registerDataTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener()); - - carsDtclRegistrations.add(carsDtclRegistration); + LOG.info("Registering a new CarDataTreeChangeListener"); + final var reg = dataProvider.registerTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener()); + carsDtclRegistrations.add(reg); return RpcResultBuilder.success(new RegisterLoggingDtclOutputBuilder().build()).buildFuture(); } - @Override - public ListenableFuture> unregisterLoggingDtcls( + private ListenableFuture> unregisterLoggingDtcls( final UnregisterLoggingDtclsInput input) { - LOG_CAR_PROVIDER.info("Unregistering the CarDataTreeChangeListener(s)"); + LOG.info("Unregistering the CarDataTreeChangeListener(s)"); synchronized (carsDtclRegistrations) { int numListeners = 0; - for (ListenerRegistration carsDtclRegistration : carsDtclRegistrations) { + for (var carsDtclRegistration : carsDtclRegistrations) { carsDtclRegistration.close(); numListeners++; } carsDtclRegistrations.clear(); - LOG_CAR_PROVIDER.info("Unregistered {} CaraDataTreeChangeListener(s)", numListeners); + LOG.info("Unregistered {} CaraDataTreeChangeListener(s)", numListeners); } return RpcResultBuilder.success(new UnregisterLoggingDtclsOutputBuilder().build()).buildFuture(); } - @Override @SuppressWarnings("checkstyle:IllegalCatch") - public ListenableFuture> unregisterCommitCohort( + private ListenableFuture> unregisterCommitCohort( final UnregisterCommitCohortInput input) { closeCommitCohortRegistration(); @@ -302,23 +318,20 @@ public class CarProvider implements CarService { } private void closeCommitCohortRegistration() { - final DOMDataTreeCommitCohortRegistration reg = commitCohortReg.getAndSet(null); + final var reg = commitCohortReg.getAndSet(null); if (reg != null) { reg.close(); - LOG_CAR_PROVIDER.info("Unregistered commit cohort"); + LOG.info("Unregistered commit cohort"); } } - @Override - public synchronized ListenableFuture> registerCommitCohort( + private synchronized ListenableFuture> registerCommitCohort( final RegisterCommitCohortInput input) { if (commitCohortReg.get() != null) { return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture(); } - final DOMDataTreeCommitCohortRegistry commitCohortRegistry = (DOMDataTreeCommitCohortRegistry) - domDataBroker.getSupportedExtensions().get(DOMDataTreeCommitCohortRegistry.class); - + final var commitCohortRegistry = domDataBroker.extension(CommitCohortExtension.class); if (commitCohortRegistry == null) { // Shouldn't happen return RpcResultBuilder.failed().withError(ErrorType.APPLICATION, @@ -333,12 +346,10 @@ public class CarProvider implements CarService { // 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())); + commitCohortReg.set(commitCohortRegistry.registerCommitCohort(DOMDataTreeIdentifier.of( + LogicalDatastoreType.CONFIGURATION, carEntryPath), new CarEntryDataTreeCommitCohort())); - LOG_CAR_PROVIDER.info("Registered commit cohort"); + LOG.info("Registered commit cohort"); return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture(); }