From dddc5c7faaa4991535e56c8b16c9ecb2f5303ab0 Mon Sep 17 00:00:00 2001 From: tpantelis Date: Tue, 8 Jul 2014 01:53:29 -0400 Subject: [PATCH 1/1] Bug 1112: Update toaster to use async best practices Change-Id: Icc4f51e588d524e1c545c7530072209b8f5c36fd Signed-off-by: tpantelis --- .../md-sal/samples/toaster-consumer/pom.xml | 4 + .../impl/KitchenServiceModule.java | 7 +- .../sample/kitchen/api/KitchenService.java | 6 +- .../kitchen/impl/KitchenServiceImpl.java | 120 ++++++- .../sample/toaster/it/ToasterTest.java | 8 +- .../toaster-it/src/test/resources/logback.xml | 4 +- .../toaster/provider/OpendaylightToaster.java | 298 +++++++++++++----- 7 files changed, 344 insertions(+), 103 deletions(-) diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index f6a8306a98..6e720299d8 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -23,6 +23,10 @@ org.opendaylight.controller config-api + + org.opendaylight.controller + sal-common-util + org.opendaylight.controller sal-binding-api diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java index a23def6262..88281bd593 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java @@ -9,6 +9,8 @@ */ package org.opendaylight.controller.config.yang.config.kitchen_service.impl; +import java.util.concurrent.Future; + import org.opendaylight.controller.sample.kitchen.api.EggsType; import org.opendaylight.controller.sample.kitchen.api.KitchenService; import org.opendaylight.controller.sample.kitchen.impl.KitchenServiceImpl; @@ -16,6 +18,7 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.NotificationListener; +import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +66,9 @@ public final class KitchenServiceModule extends AbstractKitchenServiceModule { } @Override - public boolean makeBreakfast( final EggsType eggs, final Class toast, final int toastDoneness ) { + public Future> makeBreakfast( final EggsType eggs, + final Class toast, + final int toastDoneness ) { return kitchenService.makeBreakfast( eggs, toast, toastDoneness ); } } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java index ef9c122ec1..7e7f342962 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java @@ -1,7 +1,11 @@ package org.opendaylight.controller.sample.kitchen.api; +import java.util.concurrent.Future; + import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType; +import org.opendaylight.yangtools.yang.common.RpcResult; public interface KitchenService { - boolean makeBreakfast( EggsType eggs, Class toast, int toastDoneness ); + Future> makeBreakfast( EggsType eggs, Class toast, + int toastDoneness ); } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java index 911a8c87d7..50ae8fd04f 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java @@ -1,10 +1,18 @@ package org.opendaylight.controller.sample.kitchen.impl; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; - +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import org.opendaylight.controller.config.yang.config.kitchen_service.impl.KitchenServiceRuntimeMXBean; +import org.opendaylight.controller.sal.common.util.RpcErrors; +import org.opendaylight.controller.sal.common.util.Rpcs; import org.opendaylight.controller.sample.kitchen.api.EggsType; import org.opendaylight.controller.sample.kitchen.api.KitchenService; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInput; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInputBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterListener; @@ -12,16 +20,31 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterRestocked; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.WheatBread; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity; +import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList.Builder; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.JdkFutureAdapters; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; + public class KitchenServiceImpl implements KitchenService, KitchenServiceRuntimeMXBean, ToasterListener { private static final Logger log = LoggerFactory.getLogger( KitchenServiceImpl.class ); private final ToasterService toaster; + private final ListeningExecutorService executor = + MoreExecutors.listeningDecorator( Executors.newCachedThreadPool() ); + private volatile boolean toasterOutOfBread; public KitchenServiceImpl(ToasterService toaster) { @@ -29,39 +52,102 @@ public class KitchenServiceImpl implements KitchenService, KitchenServiceRuntime } @Override - public boolean makeBreakfast( EggsType eggs, Class toast, int toastDoneness ) { + public Future> makeBreakfast( EggsType eggsType, Class toastType, + int toastDoneness ) { + + // Call makeToast and use JdkFutureAdapters to convert the Future to a ListenableFuture, + // The OpendaylightToaster impl already returns a ListenableFuture so the conversion is + // actually a no-op. + + ListenableFuture> makeToastFuture = JdkFutureAdapters.listenInPoolThread( + makeToast( toastType, toastDoneness ), executor ); + + ListenableFuture> makeEggsFuture = makeEggs( eggsType ); + + // Combine the 2 ListenableFutures into 1 containing a list of RpcResults. + + ListenableFuture>> combinedFutures = + Futures.allAsList( ImmutableList.of( makeToastFuture, makeEggsFuture ) ); + + // Then transform the RpcResults into 1. + + return Futures.transform( combinedFutures, + new AsyncFunction>,RpcResult>() { + @Override + public ListenableFuture> apply( List> results ) + throws Exception { + boolean atLeastOneSucceeded = false; + Builder errorList = ImmutableList.builder(); + for( RpcResult result: results ) { + if( result.isSuccessful() ) { + atLeastOneSucceeded = true; + } + + if( result.getErrors() != null ) { + errorList.addAll( result.getErrors() ); + } + } + + return Futures.immediateFuture( + Rpcs. getRpcResult( atLeastOneSucceeded, errorList.build() ) ); + } + } ); + } + + private ListenableFuture> makeEggs( EggsType eggsType ) { + + return executor.submit( new Callable>() { + + @Override + public RpcResult call() throws Exception { + + // We don't actually do anything here - just return a successful result. + return Rpcs. getRpcResult( true, Collections.emptyList() ); + } + } ); + } + + private Future> makeToast( Class toastType, + int toastDoneness ) { if( toasterOutOfBread ) { log.info( "We're out of toast but we can make eggs" ); - return true; + return Futures.immediateFuture( Rpcs. getRpcResult( true, + Arrays.asList( RpcErrors.getRpcError( "", "partial-operation", null, + ErrorSeverity.WARNING, + "Toaster is out of bread but we can make you eggs", + ErrorType.APPLICATION, null ) ) ) ); } // Access the ToasterService to make the toast. - // We don't actually make the eggs for this example - sorry. - MakeToastInputBuilder toastInput = new MakeToastInputBuilder(); - toastInput.setToasterDoneness( (long) toastDoneness); - toastInput.setToasterToastType( toast ); - try { - RpcResult result = toaster.makeToast( toastInput.build() ).get(); + MakeToastInput toastInput = new MakeToastInputBuilder() + .setToasterDoneness( (long) toastDoneness ) + .setToasterToastType( toastType ) + .build(); + + return toaster.makeToast( toastInput ); + } + @Override + public Boolean makeScrambledWithWheat() { + try { + // This call has to block since we must return a result to the JMX client. + RpcResult result = makeBreakfast( EggsType.SCRAMBLED, WheatBread.class, 2 ).get(); if( result.isSuccessful() ) { - log.info( "makeToast succeeded" ); + log.info( "makeBreakfast succeeded" ); } else { - log.warn( "makeToast failed: " + result.getErrors() ); + log.warn( "makeBreakfast failed: " + result.getErrors() ); } return result.isSuccessful(); + } catch( InterruptedException | ExecutionException e ) { - log.warn( "Error occurred during toast creation" ); + log.warn( "An error occurred while maing breakfast: " + e ); } - return false; - } - @Override - public Boolean makeScrambledWithWheat() { - return makeBreakfast( EggsType.SCRAMBLED, WheatBread.class, 2 ); + return Boolean.FALSE; } /** diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java index 907b35475f..30f1762197 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java @@ -93,13 +93,13 @@ public class ToasterTest { long toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); assertEquals(0, toastsMade); - boolean toasts = true; + boolean success = true; // Make toasts using OSGi service - toasts &= kitchenService.makeBreakfast( EggsType.SCRAMBLED, HashBrown.class, 4); - toasts &= kitchenService.makeBreakfast( EggsType.POACHED, WhiteBread.class, 8 ); + success &= kitchenService.makeBreakfast( EggsType.SCRAMBLED, HashBrown.class, 4).get().isSuccessful(); + success &= kitchenService.makeBreakfast( EggsType.POACHED, WhiteBread.class, 8 ).get().isSuccessful(); - Assert.assertTrue("Not all toasts done by " + kitchenService, toasts); + Assert.assertTrue("Not all breakfasts succeeded", success); // Verify toasts made count on provider via JMX/config-subsystem toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml b/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml index f904f9726e..d76c2d3c22 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml +++ b/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml @@ -10,7 +10,9 @@ - + + + diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index ec352e8f51..d2b0f90194 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -9,19 +9,24 @@ package org.opendaylight.controller.sample.toaster.provider; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import org.opendaylight.controller.config.yang.config.toaster_provider.impl.ToasterProviderRuntimeMXBean; 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.ReadWriteTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.common.util.RpcErrors; import org.opendaylight.controller.sal.common.util.Rpcs; @@ -44,7 +49,13 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.AsyncFunction; +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.SettableFuture; public class OpendaylightToaster implements ToasterService, ToasterProviderRuntimeMXBean, DataChangeListener, AutoCloseable { @@ -61,10 +72,9 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti private final ExecutorService executor; - // As you will see we are using multiple threads here. Therefore we need to be careful about concurrency. - // In this case we use the taskLock to provide synchronization for the current task. - private volatile Future> currentTask; - private final Object taskLock = new Object(); + // The following holds the Future for the current make toast task. + // This is used to cancel the current toast. + private final AtomicReference> currentMakeToastTask = new AtomicReference<>(); private final AtomicLong amountOfBreadInStock = new AtomicLong( 100 ); @@ -83,7 +93,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti public void setDataProvider(final DataBroker salDataProvider) { this.dataProvider = salDataProvider; - updateStatus(); + setToasterStatusUp( null ); } /** @@ -97,22 +107,30 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti if (dataProvider != null) { WriteTransaction t = dataProvider.newWriteOnlyTransaction(); t.delete(LogicalDatastoreType.OPERATIONAL,TOASTER_IID); - t.commit().get(); // FIXME: This call should not be blocking. + ListenableFuture> future = t.commit(); + Futures.addCallback( future, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + LOG.debug( "Delete Toaster commit result: " + result ); + } + + @Override + public void onFailure( Throwable t ) { + LOG.error( "Delete of Toaster failed", t ); + } + } ); } } - private Toaster buildToaster() { - // We don't need to synchronize on currentTask here b/c it's declared volatile and - // we're just doing a read. - boolean isUp = currentTask == null; + private Toaster buildToaster( ToasterStatus status ) { // note - we are simulating a device whose manufacture and model are // fixed (embedded) into the hardware. // This is why the manufacture and model number are hardcoded. - ToasterBuilder tb = new ToasterBuilder(); - tb.setToasterManufacturer(TOASTER_MANUFACTURER).setToasterModelNumber(TOASTER_MODEL_NUMBER) - .setToasterStatus(isUp ? ToasterStatus.Up : ToasterStatus.Down); - return tb.build(); + return new ToasterBuilder().setToasterManufacturer( TOASTER_MANUFACTURER ) + .setToasterModelNumber( TOASTER_MODEL_NUMBER ) + .setToasterStatus( status ) + .build(); } /** @@ -133,57 +151,148 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti } /** - * RestConf RPC call implemented from the ToasterService interface. + * RPC call implemented from the ToasterService interface that cancels the current + * toast, if any. */ @Override public Future> cancelToast() { - synchronized (taskLock) { - if (currentTask != null) { - currentTask.cancel(true); - currentTask = null; - } + + Future current = currentMakeToastTask.getAndSet( null ); + if( current != null ) { + current.cancel( true ); } + // Always return success from the cancel toast call. - return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections. emptySet())); + return Futures.immediateFuture( Rpcs. getRpcResult( true, + Collections.emptyList() ) ); } /** - * RestConf RPC call implemented from the ToasterService interface. + * RPC call implemented from the ToasterService interface that attempts to make toast. */ @Override public Future> makeToast(final MakeToastInput input) { LOG.info("makeToast: " + input); - synchronized (taskLock) { - if (currentTask != null) { - // return an error since we are already toasting some toast. - LOG.info( "Toaster is already making toast" ); + final SettableFuture> futureResult = SettableFuture.create(); - RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( "", "in-use", null, ErrorSeverity.WARNING, - "Toaster is busy", ErrorType.APPLICATION, null ) ) ); - return Futures.immediateFuture(result); - } - else if( outOfBread() ) { - RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null, - "Toaster is out of bread", - ErrorType.APPLICATION, null ) ) ); - return Futures.immediateFuture(result); - } - else { - // Notice that we are moving the actual call to another thread, - // allowing this thread to return immediately. - // The MD-SAL design encourages asynchronus programming. If the - // caller needs to block until the call is - // complete then they can leverage the blocking methods on the - // Future interface. - currentTask = executor.submit(new MakeToastTask(input)); + checkStatusAndMakeToast( input, futureResult ); + + return futureResult; + } + + private List makeToasterOutOfBreadError() { + return Arrays.asList( + RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null, + "Toaster is out of bread", + ErrorType.APPLICATION, null ) ); + } + + private List makeToasterInUseError() { + return Arrays.asList( + RpcErrors.getRpcError( "", "in-use", null, ErrorSeverity.WARNING, + "Toaster is busy", ErrorType.APPLICATION, null ) ); + } + + private void checkStatusAndMakeToast( final MakeToastInput input, + final SettableFuture> futureResult ) { + + // Read the ToasterStatus and, if currently Up, try to write the status to Down. + // If that succeeds, then we essentially have an exclusive lock and can proceed + // to make toast. + + final ReadWriteTransaction tx = dataProvider.newReadWriteTransaction(); + ListenableFuture> readFuture = + tx.read( LogicalDatastoreType.OPERATIONAL, TOASTER_IID ); + + final ListenableFuture> commitFuture = + Futures.transform( readFuture, new AsyncFunction, + RpcResult>() { + + @Override + public ListenableFuture> apply( + Optional toasterData ) throws Exception { + + ToasterStatus toasterStatus = ToasterStatus.Up; + if( toasterData.isPresent() ) { + toasterStatus = ((Toaster)toasterData.get()).getToasterStatus(); + } + + LOG.debug( "Read toaster status: {}", toasterStatus ); + + if( toasterStatus == ToasterStatus.Up ) { + + if( outOfBread() ) { + LOG.debug( "Toaster is out of bread" ); + + return Futures.immediateFuture( Rpcs.getRpcResult( + false, null, makeToasterOutOfBreadError() ) ); + } + + LOG.debug( "Setting Toaster status to Down" ); + + // We're not currently making toast - try to update the status to Down + // to indicate we're going to make toast. This acts as a lock to prevent + // concurrent toasting. + tx.put( LogicalDatastoreType.OPERATIONAL, TOASTER_IID, + buildToaster( ToasterStatus.Down ) ); + return tx.commit(); + } + + LOG.debug( "Oops - already making toast!" ); + + // Return an error since we are already making toast. This will get + // propagated to the commitFuture below which will interpret the null + // TransactionStatus in the RpcResult as an error condition. + return Futures.immediateFuture( Rpcs.getRpcResult( + false, null, makeToasterInUseError() ) ); + } + } ); + + Futures.addCallback( commitFuture, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + if( result.getResult() == TransactionStatus.COMMITED ) { + + // OK to make toast + currentMakeToastTask.set( executor.submit( + new MakeToastTask( input, futureResult ) ) ); + } else { + + LOG.debug( "Setting error result" ); + + // Either the transaction failed to commit for some reason or, more likely, + // the read above returned ToasterStatus.Down. Either way, fail the + // futureResult and copy the errors. + + futureResult.set( Rpcs.getRpcResult( false, null, result.getErrors() ) ); + } } - } - updateStatus(); - return currentTask; + @Override + public void onFailure( Throwable ex ) { + if( ex instanceof OptimisticLockFailedException ) { + + // Another thread is likely trying to make toast simultaneously and updated the + // status before us. Try reading the status again - if another make toast is + // now in progress, we should get ToasterStatus.Down and fail. + + LOG.debug( "Got OptimisticLockFailedException - trying again" ); + + checkStatusAndMakeToast( input, futureResult ); + + } else { + + LOG.error( "Failed to commit Toaster status", ex ); + + // Got some unexpected error so fail. + futureResult.set( Rpcs. getRpcResult( false, null, Arrays.asList( + RpcErrors.getRpcError( null, null, null, ErrorSeverity.ERROR, + ex.getMessage(), + ErrorType.APPLICATION, ex ) ) ) ); + } + } + } ); } /** @@ -195,17 +304,15 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti public Future> restockToaster(final RestockToasterInput input) { LOG.info( "restockToaster: " + input ); - synchronized( taskLock ) { - amountOfBreadInStock.set( input.getAmountOfBreadToStock() ); + amountOfBreadInStock.set( input.getAmountOfBreadToStock() ); - if( amountOfBreadInStock.get() > 0 ) { - ToasterRestocked reStockedNotification = - new ToasterRestockedBuilder().setAmountOfBread( input.getAmountOfBreadToStock() ).build(); - notificationProvider.publish( reStockedNotification ); - } + if( amountOfBreadInStock.get() > 0 ) { + ToasterRestocked reStockedNotification = new ToasterRestockedBuilder() + .setAmountOfBread( input.getAmountOfBreadToStock() ).build(); + notificationProvider.publish( reStockedNotification ); } - return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections. emptySet())); + return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections.emptyList())); } /** @@ -225,19 +332,38 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti return toastsMade.get(); } - private void updateStatus() { - if (dataProvider != null) { - WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); - tx.put(LogicalDatastoreType.OPERATIONAL,TOASTER_IID, buildToaster()); + private void setToasterStatusUp( final Function resultCallback ) { - try { - tx.commit().get(); - } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to update toaster status, operational otherwise", e); + WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); + tx.put( LogicalDatastoreType.OPERATIONAL,TOASTER_IID, buildToaster( ToasterStatus.Up ) ); + + ListenableFuture> commitFuture = tx.commit(); + + Futures.addCallback( commitFuture, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + if( result.getResult() != TransactionStatus.COMMITED ) { + LOG.error( "Failed to update toaster status: " + result.getErrors() ); + } + + notifyCallback( result.getResult() == TransactionStatus.COMMITED ); } - } else { - LOG.trace("No data provider configured, not updating status"); - } + + @Override + public void onFailure( Throwable t ) { + // We shouldn't get an OptimisticLockFailedException (or any ex) as no + // other component should be updating the operational state. + LOG.error( "Failed to update toaster status", t ); + + notifyCallback( false ); + } + + void notifyCallback( boolean result ) { + if( resultCallback != null ) { + resultCallback.apply( result ); + } + } + } ); } private boolean outOfBread() @@ -245,19 +371,22 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti return amountOfBreadInStock.get() == 0; } - private class MakeToastTask implements Callable> { + private class MakeToastTask implements Callable { final MakeToastInput toastRequest; + final SettableFuture> futureResult; - public MakeToastTask(final MakeToastInput toast) { - toastRequest = toast; + public MakeToastTask( final MakeToastInput toastRequest, + final SettableFuture> futureResult ) { + this.toastRequest = toastRequest; + this.futureResult = futureResult; } @Override - public RpcResult call() { + public Void call() { try { - // make toast just sleeps for n secondn per doneness level. + // make toast just sleeps for n seconds per doneness level. long darknessFactor = OpendaylightToaster.this.darknessFactor.get(); Thread.sleep(darknessFactor * toastRequest.getToasterDoneness()); @@ -275,15 +404,26 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti notificationProvider.publish( new ToasterOutOfBreadBuilder().build() ); } - synchronized (taskLock) { - currentTask = null; - } + // Set the Toaster status back to up - this essentially releases the toasting lock. + // We can't clear the current toast task nor set the Future result until the + // update has been committed so we pass a callback to be notified on completion. + + setToasterStatusUp( new Function() { + @Override + public Void apply( Boolean result ) { + + currentMakeToastTask.set( null ); + + LOG.debug("Toast done"); - updateStatus(); + futureResult.set( Rpcs.getRpcResult( true, null, + Collections.emptyList() ) ); - LOG.debug("Toast done"); + return null; + } + } ); - return Rpcs. getRpcResult(true, null, Collections. emptySet()); + return null; } } } -- 2.36.6