X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FConcurrentDOMDataBrokerTest.java;h=ca255c82501da2a9ed4f1dfd4fc0802f253ea68e;hp=3a88a729cc8d56b8029159fe0bf2f29de6b2112d;hb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb;hpb=8ec73bf853a9b6708b455c0321a585992e02b125 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 3a88a729cc..ca255c8250 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,6 +19,8 @@ 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 com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; @@ -31,6 +33,7 @@ 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; @@ -42,24 +45,29 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; -import org.mockito.invocation.InvocationOnMock; 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.DOMDataReadOnlyTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; -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.DataStoreUnavailableException; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionChainListener; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; +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.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; @@ -70,21 +78,21 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public class ConcurrentDOMDataBrokerTest { - private final DOMDataWriteTransaction transaction = mock(DOMDataWriteTransaction.class); + private final DOMDataTreeWriteTransaction transaction = mock(DOMDataTreeWriteTransaction.class); private final DOMStoreThreePhaseCommitCohort mockCohort1 = mock(DOMStoreThreePhaseCommitCohort.class); private final DOMStoreThreePhaseCommitCohort mockCohort2 = mock(DOMStoreThreePhaseCommitCohort.class); private final ThreadPoolExecutor futureExecutor = - new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue()); + new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue<>()); private ConcurrentDOMDataBroker coordinator; @Before 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); + coordinator = new ConcurrentDOMDataBroker(ImmutableMap.of(LogicalDatastoreType.OPERATIONAL, store), + futureExecutor); } @After @@ -93,36 +101,30 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testSuccessfulSubmitAsync() throws Throwable { + public void testSuccessfulSubmitAsync() throws Exception { testSuccessfulSubmit(true); } @Test - public void testSuccessfulSubmitSync() throws Throwable { + public void testSuccessfulSubmitSync() throws Exception { testSuccessfulSubmit(false); } - private void testSuccessfulSubmit(final boolean doAsync) throws Throwable { + private void testSuccessfulSubmit(final boolean doAsync) throws InterruptedException { final CountDownLatch asyncCanCommitContinue = new CountDownLatch(1); - Answer> asyncCanCommit = new Answer>() { - @Override - public ListenableFuture answer(final InvocationOnMock invocation) { - final SettableFuture future = SettableFuture.create(); - if(doAsync) { - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, - 10, TimeUnit.SECONDS); - future.set(true); - } - }.start(); - } else { + Answer> asyncCanCommit = invocation -> { + final SettableFuture future = SettableFuture.create(); + if (doAsync) { + new Thread(() -> { + Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, + 10, TimeUnit.SECONDS); future.set(true); - } - - return future; + }).start(); + } else { + future.set(true); } + + return future; }; doAnswer(asyncCanCommit).when(mockCohort1).canCommit(); @@ -133,8 +135,7 @@ public class ConcurrentDOMDataBrokerTest { doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort2).commit(); - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2)); + ListenableFuture future = coordinator.submit(transaction, Arrays.asList(mockCohort1, mockCohort2)); final CountDownLatch doneLatch = new CountDownLatch(1); final AtomicReference caughtEx = new AtomicReference<>(); @@ -145,18 +146,19 @@ public class ConcurrentDOMDataBrokerTest { } @Override - public void onFailure(final Throwable t) { - caughtEx.set(t); + public void onFailure(final Throwable failure) { + caughtEx.set(failure); doneLatch.countDown(); } - }); + }, MoreExecutors.directExecutor()); asyncCanCommitContinue.countDown(); assertEquals("Submit complete", true, doneLatch.await(5, TimeUnit.SECONDS)); - if(caughtEx.get() != null) { - throw caughtEx.get(); + if (caughtEx.get() != null) { + Throwables.throwIfUnchecked(caughtEx.get()); + throw new RuntimeException(caughtEx.get()); } assertEquals("Task count", doAsync ? 1 : 0, futureExecutor.getTaskCount()); @@ -195,12 +197,12 @@ public class ConcurrentDOMDataBrokerTest { future.checkedGet(5, TimeUnit.SECONDS); fail("Expected TransactionCommitFailedException"); } catch (TransactionCommitFailedException e) { - if(expCause != null) { + if (expCause != null) { assertSame("Expected cause", expCause.getClass(), e.getCause().getClass()); } InOrder inOrder = inOrder((Object[])mockCohorts); - for(DOMStoreThreePhaseCommitCohort c: mockCohorts) { + for (DOMStoreThreePhaseCommitCohort c: mockCohorts) { inOrder.verify(c).abort(); } } catch (TimeoutException e) { @@ -251,8 +253,8 @@ public class ConcurrentDOMDataBrokerTest { DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))). - when(mockCohort3).preCommit(); + doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))) + .when(mockCohort3).preCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); CheckedFuture future = coordinator.submit( @@ -277,8 +279,8 @@ public class ConcurrentDOMDataBrokerTest { 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.immediateFailedFuture(new IllegalStateException("mock2"))) + .when(mockCohort3).commit(); doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); CheckedFuture future = coordinator.submit( @@ -290,8 +292,8 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithAbortException() throws Exception { doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock abort error"))). - when(mockCohort1).abort(); + 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(); @@ -304,7 +306,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateReadWriteTransaction(){ + public void testCreateReadWriteTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -316,7 +318,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateWriteOnlyTransaction(){ + public void testCreateWriteOnlyTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -328,7 +330,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateReadOnlyTransaction(){ + public void testCreateReadOnlyTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -340,7 +342,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForReadWriteTransactions(){ + public void testLazySubTransactionCreationForReadWriteTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreReadWriteTransaction storeTxn = mock(DOMStoreReadWriteTransaction.class); @@ -351,7 +353,7 @@ 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)); @@ -369,7 +371,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForWriteOnlyTransactions(){ + public void testLazySubTransactionCreationForWriteOnlyTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreWriteTransaction storeTxn = mock(DOMStoreWriteTransaction.class); @@ -380,7 +382,7 @@ 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)); @@ -396,7 +398,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForReadOnlyTransactions(){ + public void testLazySubTransactionCreationForReadOnlyTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreReadTransaction storeTxn = mock(DOMStoreReadTransaction.class); @@ -407,7 +409,7 @@ 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); @@ -441,19 +443,20 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction transaction, Collection cohorts) { + public CheckedFuture submit(DOMDataTreeWriteTransaction writeTx, + Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(transaction, cohorts); + return super.submit(writeTx, cohorts); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); domDataReadWriteTransaction.submit(); - latch.await(10, TimeUnit.SECONDS); + assertTrue(latch.await(10, TimeUnit.SECONDS)); assertTrue(commitCohorts.size() == 1); } @@ -486,27 +489,31 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction transaction, Collection cohorts) { + @SuppressWarnings("checkstyle:hiddenField") + public CheckedFuture submit(DOMDataTreeWriteTransaction writeTx, + Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(transaction, cohorts); + return super.submit(writeTx, cohorts); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, + mock(NormalizedNode.class)); + domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, + mock(NormalizedNode.class)); domDataReadWriteTransaction.submit(); - latch.await(10, TimeUnit.SECONDS); + assertTrue(latch.await(10, TimeUnit.SECONDS)); assertTrue(commitCohorts.size() == 2); } } @Test - public void testCreateTransactionChain(){ + public void testCreateTransactionChain() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -520,7 +527,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateTransactionOnChain(){ + public void testCreateTransactionOnChain() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -532,13 +539,15 @@ public class ConcurrentDOMDataBrokerTest { doReturn(mockChain).when(domStore).createTransactionChain(); doReturn(operationalTransaction).when(mockChain).newWriteOnlyTransaction(); - DOMTransactionChain transactionChain = dataBroker.createTransactionChain(mock(TransactionChainListener.class)); + DOMTransactionChain transactionChain = dataBroker.createTransactionChain( + mock(TransactionChainListener.class)); - 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.EMPTY, + mock(NormalizedNode.class)); } } @@ -549,13 +558,15 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), futureExecutor)) { - CheckedFuture submit1 = dataBroker.newWriteOnlyTransaction().submit(); + CheckedFuture submit1 = + dataBroker.newWriteOnlyTransaction().submit(); assertNotNull(submit1); submit1.get(); - CheckedFuture submit2 = dataBroker.newReadWriteTransaction().submit(); + CheckedFuture submit2 = + dataBroker.newReadWriteTransaction().submit(); assertNotNull(submit2); @@ -563,4 +574,29 @@ public class ConcurrentDOMDataBrokerTest { } } + @Test + public void testExtensions() { + DistributedDataStore mockConfigStore = mock(DistributedDataStore.class); + DistributedDataStore mockOperStore = mock(DistributedDataStore.class); + try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( + LogicalDatastoreType.OPERATIONAL, mockOperStore, + LogicalDatastoreType.CONFIGURATION, mockConfigStore), futureExecutor)) { + + Map, DOMDataBrokerExtension> supportedExtensions = + dataBroker.getSupportedExtensions(); + assertNotNull(supportedExtensions.get(DOMDataTreeChangeService.class)); + + DOMDataTreeCommitCohortRegistry cohortRegistry = + (DOMDataTreeCommitCohortRegistry) supportedExtensions.get(DOMDataTreeCommitCohortRegistry.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); + + verify(mockConfigStore).registerCommitCohort(path, mockCohort); + } + } }