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=bd06589f3e371a416eedf9ed6cb771376882cd03;hb=60bb47b5ce43a0bdbd297130d1321bb1fb5f7ba3;hp=3f8bff0992709710bcfac271f4b1d5ef455805e6;hpb=f64e7558ec123554f49a55e224628306c2302692;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 3f8bff0992..bd06589f3e 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,11 +8,12 @@ package org.opendaylight.controller.clustering.it.provider; import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableClassToInstanceMap; 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 edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; @@ -21,8 +22,12 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +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; @@ -31,47 +36,59 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; 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.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; +import org.opendaylight.yangtools.yang.binding.Rpc; +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; @@ -80,11 +97,10 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ -@SuppressFBWarnings("SLF4J_ILLEGAL_PASSED_CLASS") -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(); @@ -97,10 +113,14 @@ 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 EntityOwnershipListener ownershipListener = + ownershipChange -> LOG.info("ownershipChanged: {}", ownershipChange); + private final AtomicBoolean registeredListener = new AtomicBoolean(); private final Set> carsDclRegistrations = ConcurrentHashMap.newKeySet(); + + private final Set regs = new HashSet<>(); private final Set> carsDtclRegistrations = ConcurrentHashMap.newKeySet(); @@ -109,16 +129,33 @@ public class CarProvider implements CarService { 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(ImmutableClassToInstanceMap.>builder() + .put(StressTest.class, this::stressTest) + .put(StopStressTest.class, this::stopStressTest) + .put(RegisterOwnership.class, this::registerOwnership) + .put(UnregisterOwnership.class, this::unregisterOwnership) + .put(RegisterLoggingDtcl.class, this::registerLoggingDtcl) + .put(UnregisterLoggingDtcls.class, this::unregisterLoggingDtcls) + .put(RegisterCommitCohort.class, this::registerCommitCohort) + .put(UnregisterCommitCohort.class, this::unregisterCommitCohort) + .build())); } + @PreDestroy + @Deactivate public void close() { stopThread(); closeCommitCohortRegistration(); + regs.forEach(Registration::close); + regs.clear(); } private void stopThread() { @@ -134,14 +171,13 @@ 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().toJava() == 0) { - LOG_PURCHASE_CAR.info("Exiting stress test as no rate is given."); + LOG.info("Exiting stress test as no rate is given."); return Futures.immediateFuture(RpcResultBuilder.failed() .withError(ErrorType.PROTOCOL, "invalid rate") .build()); @@ -154,7 +190,7 @@ public class CarProvider implements CarService { 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 @@ -167,7 +203,7 @@ public class CarProvider implements CarService { try { tx.commit().get(5, TimeUnit.SECONDS); } catch (TimeoutException | InterruptedException | ExecutionException e) { - LOG_PURCHASE_CAR.error("Put Cars failed",e); + LOG.error("Put Cars failed",e); return Futures.immediateFuture(RpcResultBuilder.success(new StressTestOutputBuilder().build()).build()); } @@ -195,7 +231,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 { @@ -205,7 +241,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. @@ -214,15 +250,14 @@ 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() @@ -230,17 +265,15 @@ public class CarProvider implements CarService { .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); } @@ -256,23 +289,14 @@ 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"); + LOG.info("Registering a new CarDataTreeChangeListener"); final ListenerRegistration carsDtclRegistration = dataProvider.registerDataTreeChangeListener(CARS_DTID, new CarDataTreeChangeListener()); @@ -280,10 +304,9 @@ public class CarProvider implements CarService { 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) { @@ -291,14 +314,13 @@ public class CarProvider implements CarService { 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(); @@ -309,12 +331,11 @@ public class CarProvider implements CarService { final DOMDataTreeCommitCohortRegistration 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(); @@ -340,7 +361,7 @@ public class CarProvider implements CarService { commitCohortReg.set(commitCohortRegistry.registerCommitCohort(new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, carEntryPath), new CarEntryDataTreeCommitCohort())); - LOG_CAR_PROVIDER.info("Registered commit cohort"); + LOG.info("Registered commit cohort"); return RpcResultBuilder.success(new RegisterCommitCohortOutputBuilder().build()).buildFuture(); }