X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FConcurrentDOMDataBrokerTest.java;h=630d582f0c29851d7b5dacd488101b47a459b58f;hb=HEAD;hp=9044728ef6adf896745c3ccccd325f94f9483d1d;hpb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java index 9044728ef6..630d582f0c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java @@ -19,10 +19,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateNullFluentFuture; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateTrueFluentFuture; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -30,10 +33,7 @@ import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Uninterruptibles; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.SynchronousQueue; @@ -46,30 +46,27 @@ import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; import org.mockito.stubbing.Answer; -import org.opendaylight.controller.cluster.datastore.DistributedDataStore; -import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; -import org.opendaylight.controller.md.sal.common.api.data.DataStoreUnavailableException; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.mdsal.dom.api.DOMDataBroker.CommitCohortExtension; +import org.opendaylight.mdsal.dom.api.DOMDataBroker.DataTreeChangeExtension; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; +import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.spi.TransactionCommitFailedExceptionMapper; +import org.opendaylight.mdsal.dom.spi.store.DOMStore; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; /** * Unit tests for DOMConcurrentDataCommitCoordinator. @@ -78,9 +75,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public class ConcurrentDOMDataBrokerTest { - private final DOMDataWriteTransaction transaction = mock(DOMDataWriteTransaction.class); - private final DOMStoreThreePhaseCommitCohort mockCohort1 = mock(DOMStoreThreePhaseCommitCohort.class); - private final DOMStoreThreePhaseCommitCohort mockCohort2 = mock(DOMStoreThreePhaseCommitCohort.class); + private final DOMDataTreeWriteTransaction transaction = mock(DOMDataTreeWriteTransaction.class); + private final DOMStoreThreePhaseCommitCohort mockCohort = mock(DOMStoreThreePhaseCommitCohort.class); private final ThreadPoolExecutor futureExecutor = new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue<>()); private ConcurrentDOMDataBroker coordinator; @@ -89,8 +85,7 @@ public class ConcurrentDOMDataBrokerTest { public void setup() { doReturn("tx").when(transaction).getIdentifier(); - DOMStore store = new InMemoryDOMDataStore("OPER", - MoreExecutors.newDirectExecutorService()); + DOMStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService()); coordinator = new ConcurrentDOMDataBroker(ImmutableMap.of(LogicalDatastoreType.OPERATIONAL, store), futureExecutor); @@ -117,32 +112,27 @@ public class ConcurrentDOMDataBrokerTest { final SettableFuture future = SettableFuture.create(); if (doAsync) { new Thread(() -> { - Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, - 10, TimeUnit.SECONDS); - future.set(true); + Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, 10, TimeUnit.SECONDS); + future.set(Boolean.TRUE); }).start(); } else { - future.set(true); + future.set(Boolean.TRUE); } return future; }; - doAnswer(asyncCanCommit).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit(); + doAnswer(asyncCanCommit).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).commit(); - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).commit(); - - ListenableFuture future = coordinator.submit(transaction, Arrays.asList(mockCohort1, mockCohort2)); + ListenableFuture future = coordinator.commit(transaction, mockCohort); final CountDownLatch doneLatch = new CountDownLatch(1); final AtomicReference caughtEx = new AtomicReference<>(); - Futures.addCallback(future, new FutureCallback() { + Futures.addCallback(future, new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { doneLatch.countDown(); } @@ -155,7 +145,7 @@ public class ConcurrentDOMDataBrokerTest { asyncCanCommitContinue.countDown(); - assertEquals("Submit complete", true, doneLatch.await(5, TimeUnit.SECONDS)); + assertTrue("Submit complete", doneLatch.await(5, TimeUnit.SECONDS)); if (caughtEx.get() != null) { Throwables.throwIfUnchecked(caughtEx.get()); @@ -164,48 +154,31 @@ public class ConcurrentDOMDataBrokerTest { assertEquals("Task count", doAsync ? 1 : 0, futureExecutor.getTaskCount()); - InOrder inOrder = inOrder(mockCohort1, mockCohort2); - inOrder.verify(mockCohort1).canCommit(); - inOrder.verify(mockCohort2).canCommit(); - inOrder.verify(mockCohort1).preCommit(); - inOrder.verify(mockCohort2).preCommit(); - inOrder.verify(mockCohort1).commit(); - inOrder.verify(mockCohort2).commit(); + InOrder inOrder = inOrder(mockCohort); + inOrder.verify(mockCohort, times(1)).canCommit(); + inOrder.verify(mockCohort, times(1)).preCommit(); + inOrder.verify(mockCohort, times(1)).commit(); } @Test public void testSubmitWithNegativeCanCommitResponse() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); - - doReturn(Futures.immediateFuture(false)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - - DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(false)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); + doReturn(Futures.immediateFuture(Boolean.FALSE)).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); - assertFailure(future, null, mockCohort1, mockCohort2, mockCohort3); + assertFailure(coordinator.commit(transaction, mockCohort), null, mockCohort); } - private static void assertFailure(final CheckedFuture future, - final Exception expCause, final DOMStoreThreePhaseCommitCohort... mockCohorts) - throws Exception { + private static void assertFailure(final ListenableFuture future, final Exception expCause, + final DOMStoreThreePhaseCommitCohort mockCohort) throws Exception { try { - future.checkedGet(5, TimeUnit.SECONDS); + future.get(5, TimeUnit.SECONDS); fail("Expected TransactionCommitFailedException"); - } catch (TransactionCommitFailedException e) { + } catch (ExecutionException e) { + TransactionCommitFailedException tcf = TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER.apply(e); if (expCause != null) { - assertSame("Expected cause", expCause.getClass(), e.getCause().getClass()); - } - - InOrder inOrder = inOrder((Object[])mockCohorts); - for (DOMStoreThreePhaseCommitCohort c: mockCohorts) { - inOrder.verify(c).abort(); + assertSame("Expected cause", expCause.getClass(), tcf.getCause().getClass()); } + verify(mockCohort, times(1)).abort(); } catch (TimeoutException e) { throw e; } @@ -213,97 +186,42 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithCanCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); - - IllegalStateException cause = new IllegalStateException("mock"); - doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + final Exception cause = new IllegalStateException("mock"); + doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2)); - - assertFailure(future, cause, mockCohort1, mockCohort2); - } - - @Test - public void testSubmitWithCanCommitDataStoreUnavailableException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); - NoShardLeaderException rootCause = new NoShardLeaderException("mock"); - DataStoreUnavailableException cause = new DataStoreUnavailableException(rootCause.getMessage(), rootCause); - doReturn(Futures.immediateFailedFuture(rootCause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2)); - - assertFailure(future, cause, mockCohort1, mockCohort2); + assertFailure(coordinator.commit(transaction, mockCohort), cause, mockCohort); } @Test public void testSubmitWithPreCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); - - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); - IllegalStateException cause = new IllegalStateException("mock"); - doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - - DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))) - .when(mockCohort3).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); + doReturn(immediateTrueFluentFuture()).when(mockCohort).canCommit(); + final IllegalStateException cause = new IllegalStateException("mock"); + doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); - assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); + assertFailure(coordinator.commit(transaction, mockCohort), cause, mockCohort); } @Test public void testSubmitWithCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); - - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit(); - IllegalStateException cause = new IllegalStateException("mock"); - doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - - DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).preCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))) - .when(mockCohort3).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); - - assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); + doReturn(immediateTrueFluentFuture()).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).preCommit(); + final IllegalStateException cause = new IllegalStateException("mock"); + doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort).commit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); + + assertFailure(coordinator.commit(transaction, mockCohort), cause, mockCohort); } @Test public void testSubmitWithAbortException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock abort error"))) - .when(mockCohort1).abort(); - - IllegalStateException cause = new IllegalStateException("mock canCommit error"); - doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + final Exception canCommitCause = new IllegalStateException("canCommit error"); + doReturn(Futures.immediateFailedFuture(canCommitCause)).when(mockCohort).canCommit(); + final Exception abortCause = new IllegalStateException("abort error"); + doReturn(Futures.immediateFailedFuture(abortCause)).when(mockCohort).abort(); - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2)); - - assertFailure(future, cause, mockCohort1, mockCohort2); + assertFailure(coordinator.commit(transaction, mockCohort), canCommitCause, mockCohort); } @Test @@ -354,19 +272,14 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(), mock(ContainerNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(), mock(ContainerNode.class)); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of()); verify(configDomStore, never()).newReadWriteTransaction(); verify(operationalDomStore, times(1)).newReadWriteTransaction(); - - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - - verify(configDomStore, times(1)).newReadWriteTransaction(); - verify(operationalDomStore, times(1)).newReadWriteTransaction(); } } @@ -383,18 +296,13 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction(); + DOMDataTreeWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(), mock(ContainerNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(), mock(ContainerNode.class)); verify(configDomStore, never()).newWriteOnlyTransaction(); verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); - - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - - verify(configDomStore, times(1)).newWriteOnlyTransaction(); - verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); } } @@ -410,18 +318,13 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataReadOnlyTransaction dataTxn = dataBroker.newReadOnlyTransaction(); + DOMDataTreeReadTransaction dataTxn = dataBroker.newReadOnlyTransaction(); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of()); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of()); verify(configDomStore, never()).newReadOnlyTransaction(); verify(operationalDomStore, times(1)).newReadOnlyTransaction(); - - dataTxn.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); - - verify(configDomStore, times(1)).newReadOnlyTransaction(); - verify(operationalDomStore, times(1)).newReadOnlyTransaction(); } } @@ -430,12 +333,11 @@ public class ConcurrentDOMDataBrokerTest { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreReadWriteTransaction mockStoreReadWriteTransaction = mock(DOMStoreReadWriteTransaction.class); - DOMStoreThreePhaseCommitCohort mockCohort = mock(DOMStoreThreePhaseCommitCohort.class); doReturn(mockStoreReadWriteTransaction).when(operationalDomStore).newReadWriteTransaction(); doReturn(mockCohort).when(mockStoreReadWriteTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohort).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort).abort(); + doReturn(immediateFalseFluentFuture()).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); final CountDownLatch latch = new CountDownLatch(1); final List commitCohorts = new ArrayList<>(); @@ -444,18 +346,18 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction writeTx, - Collection cohorts) { - commitCohorts.addAll(cohorts); + public FluentFuture commit(DOMDataTreeWriteTransaction writeTx, + DOMStoreThreePhaseCommitCohort cohort) { + commitCohorts.add(cohort); latch.countDown(); - return super.submit(writeTx, cohorts); + return super.commit(writeTx, cohort); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of()); - domDataReadWriteTransaction.submit(); + domDataReadWriteTransaction.commit(); assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -463,56 +365,6 @@ public class ConcurrentDOMDataBrokerTest { } } - @Test - public void testSubmitWithOnlyTwoSubTransactions() throws InterruptedException { - DOMStore configDomStore = mock(DOMStore.class); - DOMStore operationalDomStore = mock(DOMStore.class); - DOMStoreReadWriteTransaction operationalTransaction = mock(DOMStoreReadWriteTransaction.class); - DOMStoreReadWriteTransaction configTransaction = mock(DOMStoreReadWriteTransaction.class); - DOMStoreThreePhaseCommitCohort mockCohortOperational = mock(DOMStoreThreePhaseCommitCohort.class); - DOMStoreThreePhaseCommitCohort mockCohortConfig = mock(DOMStoreThreePhaseCommitCohort.class); - - doReturn(operationalTransaction).when(operationalDomStore).newReadWriteTransaction(); - doReturn(configTransaction).when(configDomStore).newReadWriteTransaction(); - - doReturn(mockCohortOperational).when(operationalTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohortOperational).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohortOperational).abort(); - - doReturn(mockCohortConfig).when(configTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohortConfig).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohortConfig).abort(); - - final CountDownLatch latch = new CountDownLatch(1); - final List commitCohorts = new ArrayList<>(); - - try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( - LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, - configDomStore), futureExecutor) { - @Override - @SuppressWarnings("checkstyle:hiddenField") - public CheckedFuture submit(DOMDataWriteTransaction transaction, - Collection cohorts) { - commitCohorts.addAll(cohorts); - latch.countDown(); - return super.submit(transaction, cohorts); - } - }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - - domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, - mock(NormalizedNode.class)); - domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, - mock(NormalizedNode.class)); - - domDataReadWriteTransaction.submit(); - - assertTrue(latch.await(10, TimeUnit.SECONDS)); - - assertTrue(commitCohorts.size() == 2); - } - } - @Test public void testCreateTransactionChain() { DOMStore domStore = mock(DOMStore.class); @@ -520,7 +372,7 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), futureExecutor)) { - dataBroker.createTransactionChain(mock(TransactionChainListener.class)); + dataBroker.createTransactionChain(); verify(domStore, times(2)).createTransactionChain(); } @@ -540,15 +392,14 @@ public class ConcurrentDOMDataBrokerTest { doReturn(mockChain).when(domStore).createTransactionChain(); doReturn(operationalTransaction).when(mockChain).newWriteOnlyTransaction(); - DOMTransactionChain transactionChain = dataBroker.createTransactionChain( - mock(TransactionChainListener.class)); + DOMTransactionChain transactionChain = dataBroker.createTransactionChain(); - DOMDataWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); + DOMDataTreeWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); verify(mockChain, never()).newWriteOnlyTransaction(); - domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, - mock(NormalizedNode.class)); + domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.of(), + mock(ContainerNode.class)); } } @@ -559,15 +410,13 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), futureExecutor)) { - CheckedFuture submit1 = - dataBroker.newWriteOnlyTransaction().submit(); + FluentFuture submit1 = dataBroker.newWriteOnlyTransaction().commit(); assertNotNull(submit1); submit1.get(); - CheckedFuture submit2 = - dataBroker.newReadWriteTransaction().submit(); + FluentFuture submit2 = dataBroker.newReadWriteTransaction().commit(); assertNotNull(submit2); @@ -577,27 +426,21 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testExtensions() { - DistributedDataStore mockConfigStore = mock(DistributedDataStore.class); - DistributedDataStore mockOperStore = mock(DistributedDataStore.class); - try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( + final var mockConfigStore = mock(ClientBackedDataStore.class); + final var mockOperStore = mock(ClientBackedDataStore.class); + try (var dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, mockOperStore, LogicalDatastoreType.CONFIGURATION, mockConfigStore), futureExecutor)) { + assertNotNull(dataBroker.extension(DataTreeChangeExtension.class)); - Map, DOMDataBrokerExtension> supportedExtensions = - dataBroker.getSupportedExtensions(); - assertNotNull(supportedExtensions.get(DOMDataTreeChangeService.class)); - - DOMDataTreeCommitCohortRegistry cohortRegistry = - (DOMDataTreeCommitCohortRegistry) supportedExtensions.get(DOMDataTreeCommitCohortRegistry.class); + final var cohortRegistry = dataBroker.extension(CommitCohortExtension.class); assertNotNull(cohortRegistry); - DOMDataTreeCommitCohort mockCohort = mock(DOMDataTreeCommitCohort.class); - DOMDataTreeIdentifier path = new DOMDataTreeIdentifier( - org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION, - YangInstanceIdentifier.EMPTY); - cohortRegistry.registerCommitCohort(path, mockCohort); + final var cohort = mock(DOMDataTreeCommitCohort.class); + final var path = DOMDataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of()); + cohortRegistry.registerCommitCohort(path, cohort); - verify(mockConfigStore).registerCommitCohort(path, mockCohort); + verify(mockConfigStore).registerCommitCohort(path, cohort); } } }