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=bf551bb2058e7f8c9ba77234d20b6248c2c41612;hp=bef18ffe200216502fb7fc42fe10de657b6f7799;hb=e254db554221f96c911f93a6a3e9a1c1e0238c3d;hpb=5e7cf2452ef634dc934a3ea5a2dd95059fbab68c 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 bef18ffe20..bf551bb205 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 @@ -22,7 +22,7 @@ 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.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -48,26 +48,28 @@ 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.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.broker.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; @@ -78,7 +80,7 @@ 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 = @@ -89,8 +91,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); @@ -136,14 +137,14 @@ 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.commit(transaction, Arrays.asList(mockCohort1, mockCohort2)); 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(); } @@ -152,14 +153,15 @@ public class ConcurrentDOMDataBrokerTest { caughtEx.set(failure); doneLatch.countDown(); } - }); + }, MoreExecutors.directExecutor()); asyncCanCommitContinue.countDown(); assertEquals("Submit complete", true, doneLatch.await(5, TimeUnit.SECONDS)); if (caughtEx.get() != null) { - Throwables.propagate(caughtEx.get()); + Throwables.throwIfUnchecked(caughtEx.get()); + throw new RuntimeException(caughtEx.get()); } assertEquals("Task count", doAsync ? 1 : 0, futureExecutor.getTaskCount()); @@ -185,21 +187,22 @@ public class ConcurrentDOMDataBrokerTest { doReturn(Futures.immediateFuture(false)).when(mockCohort3).canCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + ListenableFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, null, mockCohort1, mockCohort2, mockCohort3); } - private static void assertFailure(final CheckedFuture future, + private static void assertFailure(final ListenableFuture future, final Exception expCause, final DOMStoreThreePhaseCommitCohort... mockCohorts) 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()); + assertSame("Expected cause", expCause.getClass(), tcf.getCause().getClass()); } InOrder inOrder = inOrder((Object[])mockCohorts); @@ -220,7 +223,7 @@ public class ConcurrentDOMDataBrokerTest { doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); @@ -235,7 +238,7 @@ public class ConcurrentDOMDataBrokerTest { doReturn(Futures.immediateFailedFuture(rootCause)).when(mockCohort2).canCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); @@ -258,7 +261,7 @@ public class ConcurrentDOMDataBrokerTest { .when(mockCohort3).preCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); @@ -284,7 +287,7 @@ public class ConcurrentDOMDataBrokerTest { .when(mockCohort3).commit(); doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); @@ -300,7 +303,7 @@ public class ConcurrentDOMDataBrokerTest { doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); @@ -354,7 +357,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)); @@ -383,7 +386,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)); @@ -410,7 +413,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); @@ -444,18 +447,18 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction writeTx, + public FluentFuture commit(DOMDataTreeWriteTransaction writeTx, Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(writeTx, cohorts); + return super.commit(writeTx, cohorts); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); - domDataReadWriteTransaction.submit(); + domDataReadWriteTransaction.commit(); assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -490,21 +493,22 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction transaction, + @SuppressWarnings("checkstyle:hiddenField") + public FluentFuture commit(DOMDataTreeWriteTransaction writeTx, Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(transaction, cohorts); + return super.commit(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.submit(); + domDataReadWriteTransaction.commit(); assertTrue(latch.await(10, TimeUnit.SECONDS)); @@ -542,7 +546,7 @@ public class ConcurrentDOMDataBrokerTest { DOMTransactionChain transactionChain = dataBroker.createTransactionChain( mock(TransactionChainListener.class)); - DOMDataWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); + DOMDataTreeWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); verify(mockChain, never()).newWriteOnlyTransaction(); @@ -558,15 +562,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);